Changes
Merge remote-tracking branch 'origin/dev' into dev
Refactored ChosenImage and ChosenVideo