change packaging for project from jar to war
type fixes in module names
mvn jetty plugin to allow webapp to run inside eclipse
added mygrid maven repository to pom so that jenkins will build
correctly
jar plugin version number
typos etc
Merge branch 'ian_local_changes' into ian_change_packaging_to_war

Conflicts:
	ws.server/pom.xml
remove branch change conflict marker (still built even though it was present!)
remove parent from pom. add snaphot to version
add repo info to child poms
update poms using mvn -N versions:update-child-modules
add SNAPSHOT to pom
Merge branch 'ian_change_packaging_to_war' of git@github.com:openphacts/IdentityMappingService.git into Christian

Conflicts fixed:
	README.md
	pom.xml
	ws.server/pom.xml
Merge branch 'ian_add_repo_to_child_poms' of git@github.com:openphacts/IdentityMappingService.git into Christian

Conflicts fixed:
	pom.xml
	ws.server/pom.xml
removed BriodgeDB parent