code review & cleanup
Merge branch 'feature/refactoring-users' into develop
Merge branch 'develop' of git://github.com/massiveart/SuluContactBundle into feature/refactoring-users

Conflicts:
	Entity/Contact.php