Merge branch 'Server' of https://github.com/AndrewBurian/DashboardAppliance into Server
Json compatibility is added.
TODO:
add more models/views
Added TwitterWidget/Model etc.
Fixed the merge, added Twitter account info

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

Conflicts:
	helpers/dashboardBuilder.php
add graph widget
twitter and css changes
merge server
Merge remote-tracking branch 'origin/Server' into Widget

Conflicts:
	views/numberWidget.php