1
Merge branch 'master' of github.com:goper/new.loc

Conflicts:
	application/config/database.php