UI update (localizations need updating)
Merge branch 'master' of https://github.com/InfiniDev/nds4ios

Conflicts:
	nds4ios.xcodeproj/project.pbxproj