Changes that I'm sure i've already committed before :/
Merge branch 'master' of https://github.com/jamiehutber/sdapp

Conflicts:
	www/config.xml
	www/css/style.css
	www/js/sd.functions.js
	www/sass/style.scss