changed some tweaks
Merge branch 'master' of https://github.com/muleroid/draggr

Conflicts:
	src/edu/uchicago/proprio/draggr/transfer/Device.java