Add a composite widget
Add a grunt option for faster development
Merge remote-tracking branch 'origin/master' into lunch-widget

Conflicts:
	app/app.js