local changes
Merge branch 'master' of https://github.com/jamiehutber/sdapp

Conflicts:
	www/config.xml
	www/css/style.css
	www/js/templates.js
	www/js/templates/users/profile.ejs
	www/js/views/users/profile.js
	www/sass/pages/_profile.scss