Merge branch 'master' of https://github.com/interacthings/webmagazinco

Conflicts:
	data/forum__data.php
-
--