Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh

.gitignore

@@ -0,0 +1,23 @@
+*.swp
+/.project
+/.idea
+/.bundle
+*.swp
+/config/database.yml
+/config/configuration.yml
+/files/*
+/log/*
+/public/tmp/*
+/tmp/*
+/public/cache/*
+.gitignore
+/config/newrelic.yml
+/public/images/avatars/*
+/Gemfile
+/Gemfile.lock
+/db/schema.rb
+/Gemfile.lock
+/lib/plugins/acts_as_versioned/test/debug.log
+.rbenv-gemsets
+.DS_Store
+public/api_doc/