#161: Displaying map pop-ups
Merge remote-tracking branch 'origin/master' into 161

Conflicts:
	dist/ibli-map.js
	dist/ibli-map.min.js
	src/ibli-map.js