Update ignore for IntelliJ
Merge branch 'master' into dev

Conflicts:
	.gitignore
Update Gradle support script locations