Added some ignore files; created mail mapping file to improve Git reporting
Update .gitignore
Merge branch 'master' into dev
Merge branch 'dev' of github.com:tu-software-studio/websurv into dev

Conflicts:
	.gitignore