GET appliances
bleh
Made a better SQL call
bleh
GET appliances works!
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	smartgrid.sql