Merge branch 'develop' of github.com:seek-city/seek-city into josh
Merge branch 'josh' into develop