Update
Merge branch 'master' of github.com:WattTime/watttime-android