merged the current state of myvideo-ezpublish/integration