Fixing things
Merge branch 'master' of github.com:nkp/ichack14

Conflicts:
	src/org/ichack/glassmove/MainActivity.java
	src/org/ichack/glassmove/MainService.java