dfrtgzhujk
Merge branch 'master' of https://github.com/frgossen/AndroidMove.git

Conflicts:
	RemoteController/bin/classes/de/ichede/remotecontroller/MainActivity.class
	RemoteController/bin/classes/de/ichede/remotecontroller/PlayActivity$ClientThread$1.class
	RemoteController/bin/classes/de/ichede/remotecontroller/PlayActivity$ClientThread.class
	RemoteController/bin/classes/de/ichede/remotecontroller/PlayActivity.class
	RemoteController/bin/classes/de/ichede/remotecontroller/R$drawable.class
	RemoteController/bin/classes/de/ichede/remotecontroller/R$id.class
	RemoteController/bin/classes/de/ichede/remotecontroller/R$layout.class
	RemoteController/bin/classes/de/ichede/remotecontroller/R$string.class
	RemoteController/bin/classes/de/ichede/remotecontroller/R$style.class
	RemoteController/gen/de/ichede/remotecontroller/R.java