Fix bug
Delete comment
Fix scroll view in the select view
Delete comment
Merge remote-tracking branch 'origin/master'
Fix image picker
Merge remote-tracking branch 'origin/master'