booking
merge2
merge3
merge4
Merge branch 'master' of https://github.com/kudinov-k/gml

Conflicts:
	components/com_cobalt/fields/booking/tmpl/input/default.php
	components/com_cobalt/fields/booking/tmpl/output/default.php