Daily consumption
Merge branch 'master' of https://github.com/NomeAutomation/NomeAutomation

Conflicts:
	src/com/nomeautomation/utility/server/DeviceServerCommandHandler.java