edit wht
commit wht
Merge branch 'master' of https://github.com/AI-IT-BIZ/AI-Account

Conflicts:
	application/config/database.php