Updated registration to keep in sycn with recent bugfix in gender entry
method enum('male','female')
Minor changes in error handling in company page
Reset after conflicting merge
Merge branch 'master' of
https://ongeri@github.com/ongeri/ts-web-1315.git

Conflicts:
	CFlow/application/controllers/company.php
	CFlow/application/controllers/receivingreport.php
	CFlow/application/controllers/user.php
	CFlow/application/models/employeeModel.php
	CFlow/application/views/forms/registrationform.php