Merge branch 'Server' of https://github.com/AndrewBurian/DashboardAppliance into Server
Merge branch 'Server' of https://github.com/AndrewBurian/DashboardAppliance into Server