Merge commit '25994c96cb168aec5fc6bf41a5fb7192658208a2'

Conflicts:
	FDTake/FDTakeController.h
	FDTakeExample.xcodeproj/project.pbxproj
Use full screen imagePicker when taking photo or video on iPad.