Adding .DS_Store to .gitignore
Merge branch 'master' into v0.6.0-dev

Conflicts:
	.gitignore