working on block system, adding inheritance block extend
Merge branch 'dev' of https://github.com/sinapsa/Phpngo into demos

Conflicts:
	core/functions.php
	core/main.php
	settings.php