all vctrl changed
changes in companyviecontroller
Merge remote-tracking branch 'upstream/master'