gitignore file
Merge branch 'master' into develop

* master:
  gitignore file

Conflicts:
	.gitignore