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

Conflicts:
	application/config/routes.php
	application/controllers/units.php
Merge pull request #13 from AbelAguiar/master

Merge pull request #9 from nuvtec/master
Merge pull request #10 from nuvtec/master

[REC] Classes