requirement
Merge branch 'master' of https://github.com/unisexx/bo_oracle

Conflicts:
	application/modules/act/controllers/requirement.php
 ff