Complete Convert to OOP for short code
Merge remote-tracking branch 'origin/master'

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