Various small tweaks
Merge remote-tracking branch 'origin/master'

Conflicts:
	source/App.js
Broke the spinner kind out into its own JavaScript file