update from preeda
fix db config
Merge branch 'master' of https://github.com/unisexx/ppt

Conflicts:
	application/config/database.php