Updates and fixes
Merge branch 'master' of https://github.com/QuatreCentQuatre/switchboard

Conflicts:
	bundles/switchboard/models/category/Mysql.php