Add privacy menu fixes
some changes?
Merge branch 'master' of https://github.com/jamiehutber/sdapp

Conflicts:
	www/css/style.css
	www/js/libs/plugins/chart.min.js
	www/js/main.js
	www/js/templates.js
	www/js/templates/comp/headerIn.ejs
	www/js/templates/comp/menu.ejs
	www/js/views/users/profile.js
	www/sass/style.scss