ignore target directory
fixed war name & updated tomcat 7
added driverlist for tomcat 8
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	pom.xml