^ update shortcodes
+ add shortcodes gallery
Merge branch 'refactor' of https://github.com/aploss/zo2 into refactor

Conflicts:
	src/zo2/libraries/assets.php