Merge branch 'CellForRowChange' to master

Includes CellForRowChange, FeedRefactor, and FollowFeature changes

Conflicts:
	.gitignore
	Pickle.xcodeproj/project.xcworkspace/xcshareddata/Pickle.xccheckout