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

Conflicts:
	www/config.xml
	www/css/style.css
	www/img/sex/full/oral.png
	www/index.html
	www/js/libs/plugins/flowtype.js
	www/js/libs/plugins/slider/jquery.royalslider.js
	www/js/main.js
	www/js/sd.functions.js
	www/js/templates.js
	www/js/templates/comp/footerIn.ejs
	www/js/templates/comp/headerIn.ejs
	www/js/templates/home.ejs
	www/js/templates/login/login.ejs
	www/js/templates/login/signup.ejs
	www/js/templates/sex/sexTemplate.ejs
	www/js/templates/sex/wank.ejs
	www/js/views/homeView.js
	www/js/views/loginView.js
	www/sass/_home.scss
	www/sass/_loginsignup.scss
	www/sass/_mixins.scss
	www/sass/_typography.scss
	www/sass/modules/_touchcarousel.scss
	www/sass/style.scss