sprint1
Merge pull request #5 from lichwy/company

change url of images
Sprint 1
change sitename to CouchGaze
company registration page
(company) registration page is using template 'main' now
company
change url of images
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/company-registration'
bug fix in setting_lib, removed occupation, fixed registration page
Merge remote-tracking branch 'upstream/company-registration'
test
video_uploading&info_settings
lastest_video_operation
video_latest_video_operation_beta1
Merge branch 'master' of https://github.com/lichwy/bf into lichwy-master

Conflicts:
	bonfire/modules/company/controllers/company_company.php
	bonfire/modules/company/models/company_model.php
	bonfire/modules/company/views/company_company/video_report.php
	bonfire/modules/prescreen/controllers/bootstrap.php
	bonfire/modules/prescreen/controllers/upload.php
	bonfire/modules/preview/controllers/homepage.php
	bonfire/modules/test/controllers/test.php
	bonfire/modules/user/controllers/user.php
	bonfire/modules/users/controllers/users.php
	bonfire/modules/video/models/video_model.php
	bonfire/themes/main/parts/topbar.php
	bonfire/themes/two column/css/bootstrap.css
	bonfire/themes/two column/css/style.css
	bonfire/themes/two column/css/test.css
	bonfire/themes/two column/index.php
	bonfire/themes/two column/parts/_header.php
	bonfire/themes/two column/parts/sidebar.php
	bonfire/themes/two column/parts/topbar.php
	bonfire/themes/two column/screen.css
company_video_operation_beta2
company_video_operation_beta3
fixed get logo bug, added php support