change upload image
Merge remote-tracking branch 'origin/master'
clear code
discard change in filter view controller
Merge remote-tracking branch 'origin/master'
merge commit