All media classes added
Merge branch 'master' of https://github.com/man1utdfan/wander
Merge branch 'master' into GUI