backup
backup
Merge branch '#76-HoverEdit' into #58-user-Information

Conflicts:
	src/wap/public/js/controls.js
	src/wap/views/persons/ctrlAddRemoveUser.ui
	src/wap/views/persons/editPerson.css
	src/wap/views/persons/editPerson.js
	src/wap/views/persons/editPerson.ui
	src/wap/views/persons/personInformation.ui
backup