update
Merge branch 'master' of https://github.com/unisexx/ppt

Conflicts:
	application/config/database.php
	themes/ppt/_script.php