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