fixed, not tested
stuff
Merge branch 'master' into fixTimeBug
ignored checking whether the time has passed in pebbleuicontroller