Replace 'Manila' with 'Manilla'
Merge remote-tracking branch 'origin/master'

Conflicts:
	cities