Commiting merged files.
Merged files from upstream.
CanvasRenderer, TiledGeometryLayer y GeometryLayer
Merge files
Merge branch 'master' of github.com:Emergya/SMCMapViewer into 93794_CanvasRenderer

Conflicts:
	buildAndWatch.sh
	src/SMC.js
	src/layers/geometry/CanvasRenderer.js
	src/layers/geometry/GeometryLayer.js
	src/layers/geometry/TiledGeometryLayer.js
	src/layers/geometry/WFSGeometryLayer.js
	src/layers/geometry/WFSTiledGeometryLayer.js
	src/layers/markers/MarkerLayer.js
	src/layers/stylers/MapCssStyler.js
	src/layers/stylers/MarkerCssStyler.js
	src/layers/stylers/Styler.js
	src/layers/stylers/parser.txt
	src/providers/WFSProvider.js
wfs Provider and stylers
Merge pull request #46 from adrianagm/93794_CanvasRenderer

93794 canvas renderer
Merge branch 'master' of github.com:Emergya/SMCMapViewer

Conflicts:
	src/layers/stylers/MarkerCssStyler.js
	src/layers/stylers/Styler.js