Merged new towerdefense files in master