no message
Merge branch 'master' of https://github.com/Paycheur/yesorlandofl

Conflicts:
	View/components/search-form.php
main dashboard