merge adamLo/ELCImagePickerController/commit/2c77cdeea3ae540c4490e2c6a67eb116d752c1e9