Update to MadisonLive
Merge branch 'develop' of github.com:madisonpdx/MadisonLive into develop