Update pom.xml
Merge branch 'master' of https://github.com/dlhextall/gti525-ticketz.git

Conflicts:
	spring-mvc/pom.xml