blabla
Merge branch 'master' of https://github.com/ksallberg/gyrosfest

Conflicts:
	src/android/src/com/kjellinc/gyrosfest/NetworkService.java
	src/android/src/com/kjellinc/gyrosfest/StartActivity.java