incentive last version
Merge branch 'master' of https://github.com/wangbo870329/bf into wangbo870329-master

Conflicts:
	bonfire/modules/company/controllers/company_company.php
	bonfire/themes/two_column/index.php
	bonfire/themes/two_column/parts/_footer.php
merged everything