Update from server Tue Nov  4 13:09:30 EST 2014
Merge branch 'master' of https://github.com/epgmedia/epgmediallc