most recent
Merge branch 'develop' of https://github.com/jeffreybaird/clink into develop

Conflicts:
	client/views/header/header.html