Added getroom and get allrooms methods to device manager

Condensed device_room table into devices table
Merge branch 'master' of https://github.com/NomeAutomation/NomeAutomation

Conflicts:
	src/com/nomeautomation/devicemanager/devices/DeviceManager.java