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
work
google things
added circular progress bars.
Merge branch 'feature/layouts' into feature/Results

Conflicts:
	BlunoBasicDemo/AndroidManifest.xml
	BlunoBasicDemo/res/values/strings.xml
eod promote
added gps
nerged with results

/Results' into feature/layouts

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
fixes for results
push for peter
fix
Merge branch 'feature/Benjamin' into feature/Results

Conflicts:
	BlunoBasicDemo/AndroidManifest.xml
	BlunoBasicDemo/res/values/strings.xml
	BlunoBasicDemo/src/com/example/blunobasicdemo/BlunoLibrary.java
	BlunoBasicDemo/src/com/example/blunobasicdemo/MainActivity.java
	BlunoBasicDemo/src/com/example/blunobasicdemo/Results.java
History tab
update
main activity stuff
created landing page
something
fix
Merge branch 'feature/layouts' of https://github.com/QuasimodoNZ/Bluno-WaiNZ into feature/layouts