models
Merge branch 'master' of https://github.com/piratework/ide

Conflicts:
	source/index.html
	source/scripts/config/core.js
	source/scripts/views/composite_component.js
	source/scripts/views/msrm.js
	source/scripts/views/primitive_component.js
	source/styles/main.css