edit SMatAsset (aon)
Other Income (aon)
database
Merge branch 'master' of https://github.com/AI-IT-BIZ/AI-Account

Conflicts:
	application/config/database.php