Plugin Update
Merge branch 'master' of https://github.com/andreaspfurtscheller/cube

Conflicts:
	basket/LightSwitch_1.1_2014_02_23.cube
	basket/RoomLight_update.cube