Revert "Merging upstream changes."

This reverts commit a97ebf9cc03349a7c2122513da75e071cdb3b08d, reversing
changes made to 5207c4e5c198b0147f4633401f9f0049d4fc00e4.
Fix conflict in Xcode project file.
Revert "Merging upstream commits."

This reverts commit 3250b1cc077df4a6582d2bf718ebacd3b4467197.

Conflicts:
	RZCollectionList-Demo/RZCollectionList-Demo.xcodeproj/project.pbxproj