initial commit
Merge https://github.com/boyshousemedia/mediaserver