20141216
20141216 2nd
Merge branches 'master' and 'master' of github.com:taglog/baobaowansha

Conflicts:
	baobaowansha2.xcodeproj/project.pbxproj