update user information and update the layout
update user information and update the layout
Merge branch 'feature/updateUser' of git://github.com/coopdevs/katuma_webApp into feature/updateUser

* 'feature/updateUser' of git://github.com/coopdevs/katuma_webApp:
  update user

Conflicts:
	js/Modules/Commons/ServerManagment.js
	js/Modules/Private/Layouts/PrivateLayout.js