bug fixes
Merge branch 'dev' of github.com:dwoodard/MediaCloud into dev