Added script to .gitignore
Merge branch 'master' into devel

Conflicts:
	.gitignore