implemented controls to entity and player and added control methods
Merge remote-tracking branch 'origin/master'