FIT-40: Add support for TEXT and HTML in the wms featureinfo
Merge branch 'master' into FIT-40
Merge remote-tracking branch 'origin/master' into GWT-452
Merge remote-tracking branch 'origin/FIT-40' into magdageo
Merge remote-tracking branch 'origin/GWT-452' into magdageo