Fixing the damn conflicts.
Merge remote-tracking branch 'upstream/master'
Added Player Controller

Added controller class for handling player input. Currently it's behaves
about the same as NavMesh.
Merge remote-tracking branch 'upstream/master'
Add Player Controller

Player controller handles point-and-click movement - if clicked on an
enemy it the player will approach them up to a temporary range value.

Also moved some scripts around.
Merge pull request #11 from rdurel423/master

Added Player Controller