start migrating mapfishapp to epsg:3857
merge with master
merge with master
updated template submodule