aa
Merge branch 'master' of github.com:lamperwang/dushuba

Conflicts:
	Gemfile.lock
	config/initializers/devise.rb