Merge branch 'Server' of https://github.com/AndrewBurian/DashboardAppliance into Server
Json compatibility is added.
TODO:
add more models/views