mark parapgraphs
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/partials/default.html
merge fix