Modified ignored files and directories in gitignore
Merge branch 'theodul-pass-player-gitignore' of https://github.com/dbck/Opencast-Matterhorn into dbck-theodul-pass-player-gitignore

Conflicts:
	.gitignore