merge
add google map widget
add gallery component
Merge remote-tracking branch 'origin/merge'

Conflicts:
	Components/AdminPanel/component.js
	Components/Pages/views/admin/edit.html
	Framework/CMS/Widget.php
	install/components/99-Sample data.sql