add getLamp by ID method
Merge branch 'master' of https://github.com/tbolle/DelightfulAndroid

Conflicts:
	Delightful/src/com/light/controll/LampControll.java