database config
Merge branch 'master' of https://github.com/Appad/PTServer

Conflicts:
	application/config/database.php