inspect & act
...
Merge branch 'master' of https://github.com/iYottt/boffice

Conflicts:
	application/config/database.php
111