Issue #42 Fixes documentation
Merge branch 'master' into C1_Amina_1.4_Activate_Deactivate

Conflicts:
	Idearator/app/controllers/users_controller.rb
Merge pull request #62 from DevYah/C1_Amina_1.4_Activate_Deactivate

Issue #42 , activate deactivate