Integrate Aaron's PlayerControl into Player2

Now two control system can be switched very well.