Cleaned some code
Merge branch 'master' of github.com:vicmurol/media-manager.git