detail
Merge branch 'master' of https://github.com/interacthings/webmagazinco
clear conflict markers.
Merge branch 'master' of https://github.com/interacthings/webmagazinco

Conflicts:
	content.php
	data/forum__detail.php