updated english changelog
updated changelog
updated changelog
cleanup wakelock handling
Merge branch 'master' into 1.1

Conflicts:
	AndroidManifest.xml
	src/main/java/org/blitzortung/android/app/Main.java