Continued development on PluginManager.
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/PluginManager/views/plugin-admin.html