Upgrade for 1.2 process
Merge branch 'refactor' of https://github.com/aploss/zo2 into refactor

Conflicts:
	src/zo2/libraries/framework.php
	src/zo2/zo2.php