ugghh  Context-menu
Merge branch 'dev' of https://github.com/dwoodard/MediaCloud into dev