merged integration branch of myvideo-ezpublish