Merge pull request #262 from ruijunhuang2010/master

update
Merge pull request #263 from ruijunhuang2010/master

resume challenge
Merge pull request #11 from ChrisBoesch/master

update
IOS 6 debug #2
Merge pull request #264 from LI-HE/master

IOS 6 debug #2
Merge pull request #28 from ChrisBoesch/master

update