fix default icon usecase
Merge branch 'release-2.1' of https://github.com/esohns-humana/mxn

Conflicts:
	source/mxn.openlayers.core.js