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

Conflicts:
	client/css/_header.styl