Merge branch 'master' into dev_up

Conflicts:
	.scrutinizer.yml
	email_imap_cron.php
	sources/Load.php
	sources/admin/ManageLanguages.controller.php
	sources/admin/ManageMail.controller.php
	sources/controllers/Display.controller.php
	sources/controllers/Likes.controller.php
	sources/controllers/MessageIndex.controller.php
	sources/controllers/News.controller.php
	sources/controllers/Recent.controller.php
	sources/controllers/Search.controller.php
	sources/database/Db-mysql.class.php
	sources/subs/Profile.subs.php