a
Merge branch 'master' of https://github.com/AI-IT-BIZ/AI-Account
Merge branch 'master' of https://github.com/AI-IT-BIZ/AI-Account
wang
Merge branch 'master' of https://github.com/AI-IT-BIZ/AI-Account
wang
Merge branch 'master' of https://github.com/AI-IT-BIZ/AI-Account

Conflicts:
	application/controllers/invoice.php