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

Conflicts:
	bonfire/modules/company/models/company_model.php
	bonfire/modules/company/views/company_company/operation_status.php
	bonfire/modules/company/views/inline_js/set_video_info.js.php
	bonfire/modules/question/models/question_model.php
	bonfire/modules/test/controllers/test_callback.php
	bonfire/modules/test/views/inline_js/callback.js.php
	bonfire/modules/user_information/models/user_information_model.php
	bonfire/themes/Two column/ajax.php
	bonfire/themes/Two column/css/test.css
	bonfire/themes/Two column/images/Footer.jpg
	bonfire/themes/Two column/images/Logo.png
	bonfire/themes/Two column/images/LogoPSD.jpg
	bonfire/themes/Two column/images/SlideImage1.gif
	bonfire/themes/Two column/images/SlideImage2.jpg
	bonfire/themes/Two column/images/SlideImage3.jpg
	bonfire/themes/Two column/images/SlideImage4.jpg
	bonfire/themes/Two column/images/black-opacity-60.png
	bonfire/themes/Two column/images/black-opacity-80.png
	bonfire/themes/Two column/images/glyphicons-halflings-sprite.png
	bonfire/themes/Two column/images/glyphicons-halflings-white.png
	bonfire/themes/Two column/images/glyphicons-halflings.png
	bonfire/themes/Two column/images/homepage/Logo.png
	bonfire/themes/Two column/images/homepage/arrows.png
	bonfire/themes/Two column/images/homepage/black-opacity-40.png
	bonfire/themes/Two column/images/homepage/black-opacity-60.png
	bonfire/themes/Two column/images/homepage/black-opacity-80.png
	bonfire/themes/Two column/images/homepage/wall7.jpg
	bonfire/themes/Two column/images/homepage/white-opacity-40.png
	bonfire/themes/Two column/images/homepage/white-opacity-60.png
	bonfire/themes/Two column/images/homepage/white-opacity-80.png
	bonfire/themes/Two column/images/logo_v1.png
	bonfire/themes/Two column/images/user.png
	bonfire/themes/Two column/images/white-opacity-40.png
	bonfire/themes/Two column/images/white-opacity-60.png
	bonfire/themes/Two column/images/white-opacity-80.png
	bonfire/themes/Two column/index.php
	bonfire/themes/Two column/js/bootstrap.js
	bonfire/themes/Two column/js/bootstrap.min.js
	bonfire/themes/Two column/js/dropdown_control.js
	bonfire/themes/Two column/parts/_footer.php
	bonfire/themes/Two column/screen-rtl.css
	bonfire/themes/Two column/screen.css
	bonfire/themes/two column/ajax.php
	bonfire/themes/two column/css/test.css
	bonfire/themes/two column/images/Logo.png
	bonfire/themes/two column/images/LogoPSD.jpg
	bonfire/themes/two column/images/SlideImage1.gif
	bonfire/themes/two column/images/SlideImage2.jpg
	bonfire/themes/two column/images/SlideImage3.jpg
	bonfire/themes/two column/images/SlideImage4.jpg
	bonfire/themes/two column/images/black-opacity-60.png
	bonfire/themes/two column/images/black-opacity-80.png
	bonfire/themes/two column/images/glyphicons-halflings-sprite.png
	bonfire/themes/two column/images/glyphicons-halflings-white.png
	bonfire/themes/two column/images/glyphicons-halflings.png
	bonfire/themes/two column/images/homepage/Footer.jpg
	bonfire/themes/two column/images/homepage/Logo.png
	bonfire/themes/two column/images/homepage/arrows.png
	bonfire/themes/two column/images/homepage/black-opacity-40.png
	bonfire/themes/two column/images/homepage/black-opacity-60.png
	bonfire/themes/two column/images/homepage/black-opacity-80.png
	bonfire/themes/two column/images/homepage/wall7.jpg
	bonfire/themes/two column/images/homepage/white-opacity-40.png
	bonfire/themes/two column/images/homepage/white-opacity-60.png
	bonfire/themes/two column/images/homepage/white-opacity-80.png
	bonfire/themes/two column/images/logo_v1.png
	bonfire/themes/two column/images/user.png
	bonfire/themes/two column/images/white-opacity-40.png
	bonfire/themes/two column/images/white-opacity-60.png
	bonfire/themes/two column/images/white-opacity-80.png
	bonfire/themes/two column/index.php
	bonfire/themes/two column/js/bootstrap.js
	bonfire/themes/two column/js/bootstrap.min.js
	bonfire/themes/two column/js/dropdown_control.js
	bonfire/themes/two column/parts/_footer.php
	bonfire/themes/two column/screen-rtl.css
	bonfire/themes/two column/screen.css
	bonfire/themes/two_column/ajax.php
	bonfire/themes/two_column/css/bootstrap-responsive.css
	bonfire/themes/two_column/css/bootstrap-responsive.min.css
	bonfire/themes/two_column/css/bootstrap.css
	bonfire/themes/two_column/css/bootstrap.min.css
	bonfire/themes/two_column/css/main.css
	bonfire/themes/two_column/css/style.css
	bonfire/themes/two_column/css/test.css
	bonfire/themes/two_column/images/Logo.png
	bonfire/themes/two_column/images/LogoPSD.jpg
	bonfire/themes/two_column/images/SlideImage1.gif
	bonfire/themes/two_column/images/SlideImage2.jpg
	bonfire/themes/two_column/images/SlideImage3.jpg
	bonfire/themes/two_column/images/SlideImage4.jpg
	bonfire/themes/two_column/images/black-opacity-60.png
	bonfire/themes/two_column/images/black-opacity-80.png
	bonfire/themes/two_column/images/glyphicons-halflings-sprite.png
	bonfire/themes/two_column/images/glyphicons-halflings-white.png
	bonfire/themes/two_column/images/glyphicons-halflings.png
	bonfire/themes/two_column/images/homepage/Footer.jpg
	bonfire/themes/two_column/images/homepage/Logo.png
	bonfire/themes/two_column/images/homepage/arrows.png
	bonfire/themes/two_column/images/homepage/black-opacity-40.png
	bonfire/themes/two_column/images/homepage/black-opacity-60.png
	bonfire/themes/two_column/images/homepage/black-opacity-80.png
	bonfire/themes/two_column/images/homepage/wall7.jpg
	bonfire/themes/two_column/images/homepage/white-opacity-40.png
	bonfire/themes/two_column/images/homepage/white-opacity-60.png
	bonfire/themes/two_column/images/homepage/white-opacity-80.png
	bonfire/themes/two_column/images/logo_v1.png
	bonfire/themes/two_column/images/user.png
	bonfire/themes/two_column/images/white-opacity-40.png
	bonfire/themes/two_column/images/white-opacity-60.png
	bonfire/themes/two_column/images/white-opacity-80.png
	bonfire/themes/two_column/index.php
	bonfire/themes/two_column/js/bootstrap.js
	bonfire/themes/two_column/js/bootstrap.min.js
	bonfire/themes/two_column/js/dropdown_control.js
	bonfire/themes/two_column/parts/_footer.php
	bonfire/themes/two_column/parts/modal_login.php
	bonfire/themes/two_column/parts/sidebar.php
	bonfire/themes/two_column/parts/topbar.php
	bonfire/themes/two_column/screen-rtl.css
	bonfire/themes/two_column/screen.css
Merge branch 'lichwy-master'

Conflicts:
	bonfire/modules/company/controllers/company_company.php
	bonfire/modules/company/views/company_company/operation_status.php
	bonfire/modules/video/models/video_model.php
	bonfire/themes/Two column/images/Footer.jpg
	bonfire/themes/Two column/images/homepage/Footer.jpg
	bonfire/themes/Two column/images/white-opacity-40.png
	bonfire/themes/Two column/images/white-opacity-60.png
	bonfire/themes/Two column/images/white-opacity-80.png
	bonfire/themes/two_column/css/bootstrap-responsive.css
	bonfire/themes/two_column/css/bootstrap-responsive.min.css
	bonfire/themes/two_column/css/bootstrap.css
	bonfire/themes/two_column/css/bootstrap.min.css
	bonfire/themes/two_column/css/main.css
	bonfire/themes/two_column/css/style.css
	bonfire/themes/two_column/images/Footer.jpg
	bonfire/themes/two_column/images/homepage/Footer.jpg
	bonfire/themes/two_column/images/homepage/Footer.jpg.orig
	bonfire/themes/two_column/images/homepage/white-opacity-40.png.orig
	bonfire/themes/two_column/images/homepage/white-opacity-60.png.orig
	bonfire/themes/two_column/images/homepage/white-opacity-80.png.orig
	bonfire/themes/two_column/images/white-opacity-40.png
	bonfire/themes/two_column/images/white-opacity-60.png
	bonfire/themes/two_column/images/white-opacity-80.png
	bonfire/themes/two_column/parts/modal_login.php
	bonfire/themes/two_column/parts/sidebar.php
	bonfire/themes/two_column/parts/topbar.php
	bonfire/themes/two_column/screen-rtl.css