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

Conflicts:
	content.php
	data/forum__detail.php
fuk

öf
a

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