Restart dock
Merge branch 'dev'

Conflicts:
	.DS_Store