Initial commit - cleaning
Merge branch 'master' of https://github.com/ChrisMahlke/explorer

Conflicts:
	application_boilerplate/js/gridUtils.js
	application_boilerplate/js/main.js
	application_boilerplate/js/mapUtils.js
	application_boilerplate/js/timelineLegendUtils.js
	application_boilerplate/js/timelineUtils.js
	application_boilerplate/js/uiUtils.js