fix for loading issue
Merge branch 'master' of github.com:Alfresco/ThunderOps

Conflicts:
	app/console/app/scripts/controllers/plugins.coffee