*
Merge branch 'master' of https://github.com/dimd13/cing

Conflicts:
	application/config/database.php
*