add some files for zo2
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/system/zo2/core/Zo2Framework.php