cleanup wakelock handling
cleanup wakelock handling
Merge branch 'master' into 1.1
wakelock error handling
updated version
Merge branch 'master' into 1.1

Conflicts:
	AndroidManifest.xml
updated version
re added wakelock timeouts
updated version
Merge branch 'master' into 1.1

Conflicts:
	AndroidManifest.xml
updated version