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