merged scripts
Merge branch 'master' of https://github.com/akosel/DataDive

Conflicts:
	js/map.js