Large merge

New publication model, new publication page features, a bit of refactoring, java geoserver import caller js geoserver import caller, merge conflict resolution