Update gitignore.
Modify ignore files.
Merge branch 'master' of https://github.com/raksuns/Tomcat70x.git

Conflicts:
	.classpath
	.gitignore
	.project