make spec pass
Merge branch 'master' of github.com:mindpin/eshare

Conflicts:
	app/models/user.rb