Allow graphs from both render engines (flot and cairo) to exist in the same dashboard.
Merge branch 'rfc/dashboard_flot' into appnexus_rollup

Conflicts:
	webapp/content/js/dashboard.js