map works now

still need to add markers to map
Merge branch 'Server' of https://github.com/AndrewBurian/DashboardAppliance into Server

Conflicts:
	data/dashboards/numberDashboard.json
	helpers/recollectAPI.php