Main activity changed
Merge branch 'master' of https://github.com/neilfordyce/CycleSafe

Conflicts:
	src/com/example/cyclesafe/ServiceServer.java