merge fixed and wake lock disabled
Merge branch 'android_app' of https://github.com/PosMich/WC-Car into android_app