Fixing bugs described in DEVNOTES.md
Preapre for revert
Revert "Fixing bugs described in DEVNOTES.md"

This reverts commit ac1339d24a85f4515fc07966e61c8f317968633f.

Conflicts:
	bakery/template-engine.php
	db/_db.json