Make sure when we are locking things that it isnt already locked...

Make sure when we unlock things that is IS already locked...
When looking for entities to lock we want entities that are both .!isTargeting and !isTarget (not OR)
Merge branch 'BleedingEdge' into QuesrorUIUpdate