db v0.02
Merge branch 'master' of https://github.com/faridyusof727/infi

Conflicts:
	application/controllers/logsys.php
Merge branch 'master' of https://github.com/faridyusof727/infi