merge
Merge branch 'master' of https://github.com/keyboardr/WinkMeat

Conflicts:
	android/WinkMeat/src/com/winkmeat/glass/StartupService.java