added display control, video, html widget
Merge commit '39df9b9ff847e7b471abf2639219ac2f3d28bc9d' into HEAD