Merge branch 'master' of github.com:mikaoj/BSImagePicker