[REC] Classes
Merge branch 'master' of https://github.com/nuvtec/sia-erp

Conflicts:
	application/config/routes.php
	application/controllers/units.php