Added localization
Merge remote-tracking branch 'origin/master'

Conflicts:
	CafeeManu.xcodeproj/project.pbxproj