Entry formatting
Merge branch 'master' of github.com:f-breidenstein/cda

Conflicts:
	_layouts/default.html