Added content to detail page
Merge branch 'master' of https://github.com/JipRoos/cmda-bs-prototype

Conflicts:
	detail.html