Better back pressed navigation
Merge branch 'master' of https://github.com/yudasinal/WakeMeApp
Merge