english language localization
Merge branch 'master' of https://github.com/quappi/Columbus

Conflicts:
	iOS/Columbus/AppDelegate.m
merge