Fixing image paths in main.gsp
Adding ajaxSetup calls before ajax calls so that JSON queries get properly parsed when running as a war on Jetty
Merge branch 'develop' of https://github.com/Spantree/okmercury into develop