added legend and more data to graph. more css
Merge branch 'Server' of https://github.com/AndrewBurian/DashboardAppliance into Server

Conflicts:
	helpers/recollectAPI.php