fixing typo
initial implementation of media object upload and inheritance
Merge branch 'master' of github.com:rors/campus-medius