Merge remote-tracking branch 'origin/Jing'

Conflicts:
	TextbookExchange.xcodeproj/project.pbxproj