CSS after and before should have two :: and not on :.
Merge branch 'development' into index-views

Conflicts:
	client/css/_header.styl
Style.
Pull request feedback.
Merge pull request #480 from peerlibrary/index-views

Catalogs of entities
Bugfix for template.
Tooltips should have dots at the end.
We need user's _id for currently logged in user.

But to make sure objectify of sub-documents work we add _id to catalog
fields as well.
Merge branch 'development' into permissions-ui

Conflicts:
	client/templates/publications.html