openlayers2 working with wms, proj4js, vectorlayer
Merge branch 'feature/openlayers' into develop

Conflicts:
	index.html