Lots of changes.
Merge branch 'master' of https://github.com/edarn/kryp-client into nytt

Conflicts:
	IOIOSimpleApp/src/se/tna/krypgrund/KrypgrundsService.java
Merge branch 'master' of https://github.com/edarn/kryp-client.git into nytt

Conflicts:
	DataLogger/AndroidManifest.xml
	DataLogger/project.properties
	IOIOSimpleApp/src/se/tna/krypgrund/KrypgrundsService.java
Who knows what fixes this is. :)