Merge branch 'master' of https://github.com/lichwy/bf

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
bug fix
rename 'Two column' to 'two_column'
Merge remote-tracking branch 'origin'

Conflicts:
	bonfire/modules/company/controllers/company_company.php
	bonfire/modules/company/views/company_company/operation_status.php
	bonfire/modules/company/views/company_company/video_info_setting.php
	bonfire/modules/prescreen/controllers/themetest.php
	bonfire/themes/Two column/css/style.css
	bonfire/themes/Two column/parts/topbar.php
	bonfire/themes/two column/css/style.css
	bonfire/themes/two column/parts/topbar.php
	bonfire/themes/two_column/css/style.css
	bonfire/themes/two_column/css/test.css
	bonfire/themes/two_column/parts/company_sidebar.php
	bonfire/themes/two_column/parts/topbar.php