Template used and various improvments
Merge branch 'master' of github.com:gsurrel/GeoPost-server