video_thumbnail&edit_company
add_db_backup
report module
Merge branch 'master' of https://github.com/lichwy/bf into lichwy-master

Conflicts:
	bonfire/modules/company/config/upload_logo.php
	bonfire/modules/company/controllers/company.php
	bonfire/modules/company/controllers/company_company.php
	bonfire/modules/company/models/company_model.php
	bonfire/modules/company/views/company_company/company_list.php
	bonfire/modules/company/views/company_company/company_page.php
	bonfire/modules/company/views/company_company/upload_test.php
	bonfire/modules/company/views/company_company/video_list.php
	bonfire/modules/company/views/company_company/video_report.php
	bonfire/modules/company/views/company_company/video_review_report.php
	bonfire/modules/company/views/inline_js/upload_video_ajax.js.php
	bonfire/modules/test/controllers/test_upload.php
	bonfire/modules/video/controllers/content.php
	bonfire/themes/test_upload/css/bootstrap-responsive.css
	bonfire/themes/test_upload/css/bootstrap-responsive.min.css
	bonfire/themes/test_upload/css/bootstrap.css
	bonfire/themes/test_upload/css/bootstrap.min.css
	bonfire/themes/test_upload/css/jquery.fileupload-ui.css
	bonfire/themes/test_upload/css/style.css
	bonfire/themes/test_upload/index.php
	bonfire/themes/test_upload/login.php
	bonfire/themes/test_upload/parts/_footer.php
	bonfire/themes/test_upload/parts/_header.php
	bonfire/themes/test_upload/parts/head.php
	bonfire/themes/test_upload/parts/modal_login.php
	bonfire/themes/test_upload/parts/topbar.php
	bonfire/themes/test_upload/screen.css
	bonfire/themes/two_column/parts/company_sidebar.php
	bonfire/themes/two_column/parts/topbar.php