working on embedded control and view
Merge branch 'master' of https://github.com/rococori/we-connect

Conflicts:
	app/controls/main_control.js