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

Conflicts:
	www/js/global.js
	www/js/views/details/who.js
	www/js/views/users/history.js
	www/js/views/users/managewhos.js