added static map/timeline
buttons
Merge branch 'harney-devel' of https://github.com/jfharney/DiagnosticsViewer into harney-devel

Conflicts:
	django-app/uvcdat_live/exploratory_analysis/models.pyc
	django-app/uvcdat_live/exploratory_analysis/urls.pyc
	django-app/uvcdat_live/exploratory_analysis/views.pyc