Removed: DS_STORE
add display name
Merge remote-tracking branch 'origin/master' into development

Conflicts:
	package.json