Refactoring
Cleaning
Merge branch 'master' of https://github.com/BGrasnick/Awesome-Open-Data

Conflicts:
	app/scripts/views/map.js