more evaluating changes
Merge branch 'ol3-latest' of https://github.com/ROGUE-JCTD/MapLoom into ol3-latest

Conflicts:
	src/common/featuremanager/FeatureManagerService.js
	src/common/map/MapService.js