Signed-off-by: xy <xy9123@126.com>
Merge branch 'master' of github.com:xuyao91/rudao

Conflicts:
	src/Gemfile
	src/app/models/auth.rb
	src/app/views/users/new.html.erb
	src/config/routes.rb
	src/db/schema.rb
	src/db/seeds.rb

Signed-off-by: xy <xy9123@126.com>