#14 fixed
Incorporate the changes in the develop #14
closed #14
Merge branch 'feature/14' into develop

Conflicts:
	app/models/user.rb