AMECHE-236 : Implement Just in Time Media
Merge branch 'master' of https://github.com/rayo/rayo-server