fixed typo
fixed typo
fixed typo
Added the ability to define tooltip templates based on layer fields. If aa layer field named "tooltip" is found it will take precedence over tooltip templates (i.e. same behaviour as before)
Merge branch 'master' of github.com:qgis/qgis-web-client

Conflicts:
	site/js/GlobalOptions.js.templ-4326
	site/js/GlobalOptions.js.templ-900913
Merge pull request #47 from dassau/master

integrate Google and Bing background layers
Merge pull request #45 from giohappy/master

Added the ability to define tooltip templates based on layer fields
removed template 900913 since it does not make sense to keep too many templates and EPSG-3857 seems more important