[Company]
[Get code from company laptop]
Merge remote-tracking branch 'origin/master'

Conflicts:
	code/controllers/portal/PortalClaim.php
	code/models/claims/ClaimHeaderClass.php
	code/views/admin/CompanyView.php
	log/Err_20141019.log
	web/claims/1028/claim_doc_1413876150_1.jpg
	web/claims/1029/claim_doc_1413879747_2.jpg