ignoring ds store
Merge branch 'master' into 1.7

Conflicts:
	.gitignore