Stuff init
removed
Merge branch 'master' of https://github.com/jamiehutber/sdapp

Conflicts:
	www/js/global.js