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

Conflicts:
	client/templates/publication.html
Merge remote-tracking branch 'origin/newdesign'

Conflicts:
	client/templates/publication.html
Moved canvas.
Fixed annotations.
admin page fix