PURE-120: fix for LinearNavigationFunction
Update pom.xml

Update correct name for parent pom
MAJ-1094: renamed parent pom to reflect confluence
Update pom.xml

fix non existing server version
MAJ-1094: fixed wrong parent
Merge remote-tracking branch 'origin/master'
MAJ-1094: renamed parent pom to reflect confluence
MAJ-1094: removed name clash with plugin-editing-gwt for dependency checking
Merge remote-tracking branch 'origin/master' into PURE-120-Animation

Conflicts:
	geomajas-client-common-gwt-parent/geomajas-client-common-gwt-command/pom.xml
	geomajas-client-common-gwt-parent/pom.xml
	geomajas-client-gwt2-api/pom.xml
	geomajas-client-gwt2-example-base/pom.xml
	geomajas-client-gwt2-example-jar/pom.xml
	geomajas-client-gwt2-example/pom.xml
	geomajas-client-gwt2-impl/pom.xml
	geomajas-client-gwt2-impl/src/main/java/org/geomajas/gwt2/client/map/render/LinearNavigationFunction.java
	geomajas-client-gwt2-impl/src/main/java/org/geomajas/gwt2/client/map/render/MapNavigationAnimation.java
	pom.xml
pom changes after merge
Merge remote-tracking branch 'origin/PURE-120-Animation' into PURE-120-Animation

Conflicts:
	geomajas-client-gwt2-plugin-parent/geomajas-client-gwt2-plugin-wms-parent/pom.xml
	geomajas-client-gwt2-plugin-parent/pom.xml