Merge pull request #1 from Elyotna/master

merge to latest
Merge pull request #2 from Elyotna/master

test
Fixed targeting on objects

Turrets and units should now update their target display if you go out
of range
Merge pull request #56 from dotdeath/master

Fixed targeting on objects
Merge remote-tracking branch 'upstream/master'