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

Conflicts:
	application/libraries/Adodb.php
Merge branch 'master' of https://github.com/unisexx/bo_oracle
Merge branch 'master' of https://github.com/unisexx/bo_oracle