pulled and merged
Merge branch 'apimode' of https://github.com/Swiki-Anderson-and-Associates/water-meter-outdoor.git into apimode
merger changes