Merge branch 'master' of https://github.com/aykutsimseks/aid_indicators_vis

Conflicts:
	js/custom/map_doreen.js