Tweak text to display "%ld Photos, %ld Videos" in singular & plural
prefix imagePickerController delegate methods, so that delegate methods don't collide with UIImagePickerController delegate methods if used in parallel (e.g. imagePickerControllerDidCancel is also called if canceling the camera)
Merge pull request #30 from mathaeus/rename_delegate_methods

prefix imagePickerController delegate methods ...
Merge pull request #26 from anasb/master

Tweak text to display "%ld Photos, %ld Videos" in singular & plural
Update pod strcuture
Save order of selected photos
Refactoring
Disable scroll to bottom on screen-edge pan gesture
Add blank image
Show icon and duration on video thumbnail
Update strings
Update podspec
Merge pull request #32 from questbeat/refine

Refine
Bug fix
Merge branch 'master' of https://github.com/questbeat/QBImagePickerController

Conflicts:
	QBImagePickerController.podspec