Merge pull request #8 from goodnighthsu/master

获取最新项目 2014-10-17
修复bug
修复bug
优化3个标本背后故事
合并michael 3个游戏，修改

Conflicts:
	ShanghaiNaturalHistoryMuseum.xcodeproj/project.pbxproj
	ShanghaiNaturalHistoryMuseum/LookAndStudy/LookStudyViewController.m