Merge pull request #185 from burzum/develop

Develop
Merge pull request #186 from burzum/develop

Updating composer.json
CS fixes to schema.php
Merge branch 'develop' of github.com:CakeDC/users into develop
CS fixes and conditional check in the views to show the search filter based on the presence of the Search plugin
Refs https://github.com/CakeDC/users/issues/189 Fixing the Email default "from" setting, some CS fixes and some code refactoring as well