locations fixed
Merge branch 'master' of https://github.com/ChasevanHekken/clone_wars