change DB password
Merge branch 'master' of https://github.com/morganzysman/WebPPE

Conflicts:
	application/config/database.php