Merge remote-tracking branch 'upstream/master'
incentive  image preload
Merge branch 'master' of https://github.com/wangbo870329/bf into wangbo870329-master

Conflicts:
	bonfire/modules/company/models/company_model.php
	bonfire/modules/question/models/question_model.php
	bonfire/modules/user_information/models/user_information_model.php