Postgresql fixes
postgresql is now working with everything
this i think works now
fixed Merge conflict

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

Conflicts:
	helpers/dashboardBuilder.php