Something controls something something
Merge branch 'master' of https://github.com/CHAZICLE/Kino

Conflicts:
	Kino/src/kino/client/controls/ControlBindingManager.java