Fix for Never ending spinner
New target types and namespace: https://github.com/charmeproject/charme_plugin/issues/80
Fix for infinite spinner bug
New Iteration 6 Distributable
Modifications to jsonoa for type handling
Added new types
Updated types
Removed bug causing targets to be refreshed multiple times
Disabled unknown node type, renamed .PNG to .png
New target types using only charme:doctypeScheme.
Merge branch 'Iteration6Fixes' of https://github.com/charmeproject/charme_plugin into Iteration6Fixes
Merge branch 'Iteration6Fixes'

Conflicts:
	CHARMe_plugin/dist/charme-plugin.zip
	CHARMe_plugin/src/plugin/js/charme.web.controllers.js
	CHARMe_plugin/src/plugin/js/jsonoa.js
	CHARMe_plugin/src/plugin/js/jsonoa.types.js
	CHARMe_plugin/src/plugin/localData/target_types.json
Merged conflicts.