made changes to the basestation.  Fixed bugs with location calculation and nulls.
Merge branch 'master' of https://github.com/bgrosskleg/HomeAutomation