Added app mode option
Finalised demo and solved conflicts.

Merge branch 'master' of https://github.com/huddlelamp/demo-app

Conflicts:
	client/app.js