Sprint 6  incentive
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bonfire/modules/incentive/controllers/company.php
	bonfire/modules/incentive/views/company/create.php
	bonfire/modules/prescreen/controllers/themetest.php
	bonfire/modules/reviews/views/avg_rating.php
Merge https://github.com/wangbo870329/bf into wangbo