woop
Merge branch 'master' of github.com:Alfresco/ThunderOps

Conflicts:
	app/console/app/views/plugins.html
	app/console/dist/views/plugins.html