fixed possible exception
cleanup
Merge branch 'master' into android-1.5
fixed #122: start/stop screen wakelock in onWindowFocusChanged (not in onResume/onPause)
Merge branch 'master' into android-1.5