Merge branch 'develop' into reuse

diff --cc src/Model/Contact.php
Simple merge

diff --cc src/Module/Contact/Conversations.php
Simple merge

diff --cc src/Module/Register.php
Simple merge

diff --cc src/Module/Search/Acl.php
Simple merge