better data clean up
bug fix
Merge remote-tracking branch 'origin/master' into Hassan

Conflicts:
	_js/map.js
	_js/objects.js
slider semi-working, started working in dashboards. better data cleanup