Add frontend template for widget
Fix
Fix upload
Merge remote-tracking branch 'upstream/master'

Conflicts:
	classes/datasource/hybrid/field/source/gallery.php