^ update assets loading
Merge remote-tracking branch 'origin/1.4' into 1.4

Conflicts:
	src/zo2/formfields/layout.php
	src/zo2/includes/framework.php
	src/zo2/libraries/assets.php
^ update conflicted by merging