Split highgui module to videoio and highgui
Refresh code. Fix merge conflict
Merge pull request #2964 from vbystricky:highgui_split