Merge branch 'master' of github.com:mujin/mujincontrollerclientpy into HEAD

Conflicts:
	mujincontrollerclient/binpickingcontrollerclient.py
Merge branch 'master' of github.com:mujin/mujincontrollerclientpy

Conflicts:
	mujincontrollerclient/binpickingcontrollerclient.py