company_video_operation_beta5
delete  files
Merge branch 'master' of https://github.com/lichwy/bf into lichwy-master

Conflicts:
	bonfire/modules/company/views/company_company/operation_status.php
	bonfire/modules/company/views/company_company/video_info_setting.php
	bonfire/themes/two column/parts/company_sidebar.php
Merge branch 'lichwy-master'
added files