change in pom: build resources added template files
Merge branch 'master' of git@github.com:evandor/skysail-server.git

Conflicts:
	skysail.server/pom.xml