generated files
cleanup of statistics, new css, merge css, view and template, added long/short history, exclude all statistics collections, added clusterId

Conflicts:
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/_resizing.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/statistics.js
fixed cluster view and history
cleanup cluster dashboard
remove old stats
added gc for statistics
added i/o stats
Fixed a bug in dashboard. The legend in Modalviews was selected before they existed
Moved the enlarge icon of dashboard-charts to top right corner

Conflicts:
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/generated.css
dashbaord design changes

Conflicts:
	js/apps/system/aardvark/frontend/js/config/dygraphConfig.js
dashbaord design changes
Fixed position of enlarge button, and added option to show it for other charts, all enabled now because of missing history
Fixed style of new dashboard in cluster overview on click

Conflicts:
	js/apps/system/aardvark/frontend/scss/cluster.css
	js/apps/system/aardvark/frontend/scss/generated.css
cluster dashboard changes

Conflicts:
	js/apps/system/aardvark/frontend/scss/cluster.css
	js/apps/system/aardvark/frontend/scss/generated.css
cluster dashboard changes
Added a close button to cluster popup

Conflicts:
	js/apps/system/aardvark/frontend/scss/_modals.scss
	js/apps/system/aardvark/frontend/scss/generated.css
cluster dashboard changes
cluster dashboard changes
fixed cluster statistics

Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
fixed merge errors