Sync Changes

Some changes were made on the server. This commit ensures the live code
matches the repo
Merge branch 'master' of https://github.com/hwdsbcommons/Commons-Toolbar

Conflicts:
	commons-admin.php