aaaaaa
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/components/marker-creator/marker-creator.js
Merge branch 'master' of https://github.com/bluecloudy/Critical-Map