fixed failed merge file
add geocat tool bar
remove goog calls for minified mode
Fix wmts creation
Merge branch 'geocat_searchui_develop' of github.com:camptocamp/geocat into shared_object_ui