config
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
test encoding couple errors
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	MultImPick/MultipleImagePick-master1/app/build.gradle