Workaround for local deployment with web.xml located somewhere else than
src/main/resources
Merge branch 'master' of https://github.com/khyiu/NXpense.git

Conflicts:
	nxpense/pom.xml