Merge branch 'v2-photopickerplus' of https://github.com/chute/photo-picker-plus into v2-photopickerplus

Conflicts:

Android/ChutePhotoPicker+/src/com/chute/android/photopickerplus/ui/activ
ity/ChooseServiceActivity.java

Android/ChutePhotoPicker+/src/com/chute/android/photopickerplus/ui/fragm
ent/ChooseServiceFragment.java