AbletonMaster device command
AbletonMasterDeviceCommand
Testing of ableton controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	KippenServer/src/at/bakery/kippen/server/KippenServer.java
Merge branch 'master' of https://github.com/twirsing/kippen.git
move treshhold smaller
Merge branch 'master' of https://github.com/twirsing/kippen.git
client config
Merge remote-tracking branch 'origin/master'

Conflicts:
	KippenServer/src/at/bakery/kippen/server/KippenServer.java
	KippenServer/src/at/bakery/kippen/server/objects/AbstractKippenObject.java
	KippenServer/src/at/bakery/kippen/server/objects/BarrelObject.java
	KippenServer/src/at/bakery/kippen/server/objects/CubeObject.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	KippenServer/src/at/bakery/kippen/server/KippenServer.java