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

Conflicts:
	app/models/user.rb
fixed #17
fixed #18
Merge pull request #19 from nemonium/develop

v1.0.0