Editing media dictionary code
Merge remote-tracking branch 'origin/dev' into edo
Edited media dictionary code to be able to switch between segmented control