Colors updates
Merge branch 'gh-pages' of https://github.com/ChrisMahlke/explorer_dev

Conflicts:
	js/topoDataExploration.js
Color updates