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

Conflicts:
	www/css/style.css
	www/js/libs/seachPlatformTODO.js
	www/js/main.js
	www/js/sd.functions.js
	www/js/views/defaultSexView.js
	www/js/views/defaultView.js
	www/js/views/homeView.js
	www/js/views/loginView.js
	www/js/views/users/profile.js