GET appliances
bleh
Made a better SQL call
bleh
corrected backed to errors
GET appliances works!
corrected user check
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	smartgrid.sql
Merge remote-tracking branch 'origin/dev'