Update Sixties
Update Conflict
Merge pull request #118 from wareya/mmtweaks

map updates