bug fixes.
Merge branch 'feature_android_wear' of https://github.com/ne0fhyk/droidplanner into feature_android_wear