Merge pull request #15 from Yonsm/master

07231337 From Yonsm's
07232002 Update

07232002 Update / More changes
Merge branch 'master' of https://github.com/sinri/BabyNes

Conflicts:
	Resources/English.lproj/Localizable.strings
	Resources/Info.plist
	Resources/zh-Hans.lproj/Localizable.strings
	Resources/zh-Hant.lproj/Localizable.strings
07232008 GenString

07232008 GenString
Merge pull request #18 from sinri/master

07232009 Update -->release 1.0.29