Cleaning code.
meta menu
Merge remote-tracking branch 'origin/newdesign'

Conflicts:
	client/templates/publication.html