Can now parse in objects in config to create components with a config
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/lib/components.coffee