Merge commit 'a9c932dcb19461f327240f7d5c5b2a360b804e4c'

Conflicts:
	application/config/config.php
	application/config/database.php