Merge branch 'master' of https://github.com/MrNickBreen/backgroundLocation.git

Conflicts:
	www/css/index.css
	www/js/serverCommunication.js
Merge branch 'master' of https://github.com/MrNickBreen/backgroundLocation.git