Removing an error message
Merge branch 'master' into development

Conflicts:
	BlunoBasicDemo/res/values/strings.xml
	BlunoBasicDemo/src/com/example/blunobasicdemo/MainActivity.java
Fixed a naming issue with the connection state changed method, it now has 2 n's :D

Also commented out the maps fragment thing in the AndroidManifest as it was causing errors
Adding test start packet stuff
Merge branch 'development' of https://github.com/QuasimodoNZ/Bluno-WaiNZ into feature/Hannah
location tracking stuff
Merge branch 'feature/Hannah' into development
Merge branch 'feature/Results' of https://github.com/QuasimodoNZ/Bluno-WaiNZ into feature/Benjamin
Now passes the json data through to the results activity
Merge branch 'feature/Benjamin' into development
adding sent to website to data packet
test
fukin ben
Fixed some merge conflicts that occured when SCOTT merged
I can't even
Merge branch 'development' of https://github.com/QuasimodoNZ/Bluno-WaiNZ into development
bad commit
bad commit