user 3th
Merge branch 'master' of github.com:xuyao91/rudao

Conflicts:
	src/Gemfile
	src/config/application.rb
	src/db/migrate/20130829065231_create_admins.rb
	src/db/schema.rb