Working first pass of the demo app.
Merge branch 'master' into gh-pages

Conflicts:
	app/scripts/controllers/main.js
	app/views/main.html