something change?
Merge branch 'master' of https://github.com/tochange/Savigation

Conflicts:

	Savigation/src/com/tochange/yang/sector/screenobserver/ScreenUnlockReceiver.java