ye chizi
Merge branch 'master' of https://github.com/kaveh82/prizerunner.git
nothing changed
Merge branch 'master' of https://github.com/kaveh82/prizerunner.git
Merge branch 'master' of https://github.com/kaveh82/prizerunner

Conflicts:
	prizerunner-server/application/businesslogic/UserBL.php
	prizerunner-server/application/dal/UserDAL.php
	prizerunner-server/application/test/businesslogic/UserBLTest.php
nothing
Race table- Edit companyID to Not nullable
Merge branch 'master' of https://github.com/kaveh82/prizerunner