little commit before merge
Merge branch 'master' of https://github.com/zentojamorn/kafra

Conflicts:
	application/config/database.php