Merge remote-tracking branch 'upstream/master' into TransformIntoBundle

Conflicts:
	CTAssetsPickerDemo.xcodeproj/project.pbxproj
Moved new language files into Resources directory.