updated contacts to users
Merge branch 'develop' into feature/refactoring-users

Conflicts:
	Entity/Account.php
removed conflict messages
corrected comments
code review & cleanup
Merge branch 'feature/refactoring-users' into develop