some changes regarding the map
Merge branch 'Server' of https://github.com/AndrewBurian/DashboardAppliance into Server

Conflicts:
	helpers/cacheManager.php