Pom changes. Added mvn install for copying plugin to tomcat
Resolve merge conflict
Conflicts:
	memstick/utvikler3/project/pom.xml