Merge branch 'refs/heads/fix/retain-cycle' into develop
Merge branch 'refs/heads/feature/custom-remote-photo-item-class' into develop

Conflicts:
	UIPhotoGallery/UIPhotoItemView.m
Merge branch 'refs/heads/pod/add-podspec' into develop