Removed duplicate clients
Merge branch 'master' into feature/noteworthy

* master:
  Removed duplicate clients

Conflicts:
	templates/work.html