Wait Lock 2
Merge branch 'master' of https://github.com/gverner/android

Conflicts:
	InZone/AndroidManifest.xml
	InZone/src/com/codeworks/pai/processor/UpdateService.java