Merge branch 'development' into feature/Scott

Conflicts:
	BlunoBasicDemo/res/values/strings.xml
	BlunoBasicDemo/src/com/example/blunobasicdemo/MainActivity.java
Merge branch 'master' into feature/layouts
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
work
location tracking stuff
Merge branch 'feature/Hannah' into development
Created a results activity.
Added new strings for results page buttons.
test
Merge branch 'feature/Results' of https://github.com/QuasimodoNZ/Bluno-WaiNZ into feature/Benjamin
google things
Now passes the json data through to the results activity
added circular progress bars.
Merge branch 'feature/layouts' into feature/Results

Conflicts:
	BlunoBasicDemo/AndroidManifest.xml
	BlunoBasicDemo/res/values/strings.xml
Merge branch 'feature/Benjamin' into development
adding sent to website to data packet
test
eod promote
added gps