lots and lots
Merge branch 'design' into camera

Conflicts:
	script/controllers/appcontroller.js
	www/index.html