Banish IntelliJ metadata
Merge branch 'master' into feature/thundr1

Conflicts:
	.gitignore
Remove cached IntelliJ metadata