Business Layer CRUD functions.
Update DAOs.
Changed ConditionType table
Business Layer CRUD functions.
Update DAOs.
Changed ConditionType table
Merge remote-tracking branch 'origin/master'

Conflicts:
	Web_CA/.idea/workspace.xml
	Web_CA/Business/src/main/java/za/co/tera/Business/User/UserEntityManager.java