premerge
Merge branch 'master' of https://github.com/kudinov-k/gml.git

Conflicts:
	components/com_cobalt/views/records/tmpl/templateHelper.php