enable switching between wkt proj and epsg code for projection (WIP)
Merge remote-tracking branch 'upstream/master'