addressing conflicts between drawing and measuring
Merge branch 'master' of https://github.com/sfletche/ol3-marco-test