New: gitignore
Merge branch 'Develop' into Mena

Conflicts:
	.gitignore