Made some overall improvements to a few areas in preparation for an integration.
General Improvements. Started to improve media services
Merge pull request #174 from pencilblue/story/GENERAL_IMPROVEMENTS

Story/general improvements