#389 - Addresses the issue where only a certain media upload is allowed.
#389 - Updated documentation
#389 - Updated documentation
Merge pull request #390 from pencilblue/issue/389

Issue/389
Merge branch 'master' into story/REMOVE_PROMISES