Merge branch 'develop' of https://github.com/MwangiKevin/lims into develop
Abbott and Cobas Racks
Machine Racks
Machine Racks
Merge branch 'develop' of https://github.com/Shohiek/lims into feature/Uploads

Conflicts:
	application/config/views_sql.php
Uploads finished

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>