Updated .gitignore
Merge branch 'master' into stage

Conflicts:
	.gitignore