Merge branch 'mytests' of http://github.com/jhreact/jobquery-server into jamesServer
Merge branch 'makeCityPop' into dev