Merge branch 'master' of https://github.com/kaveh82/prizerunner

Conflicts:
	prizerunner-server/application/businesslogic/CompanyBL.php
	prizerunner-server/application/businesslogic/UserBL.php
	prizerunner-server/application/dal/CompanyDAL.php