Integrated towers into the UI and Gameplay
Fixed the merge Conflicts