Merge branch 'f-battlefield'
Merge branch 'windows-dev'
Merge branch 'master' into f-battlefield
balance tweaks
smarter target finding
Merge branch 'f-battlefield' into windows-dev