Hopefully fixed the issue with the plug unplugging
Merge branch 'master' of github.com:MrQweex/callisto-app

Conflicts:
	.idea/workspace.xml
	src/com/qweex/callisto/PlayerControls.java

Fuck my inability to work with git