database file update
Merge branch 'master' of github.com:chedleedriver/peplanning

Conflicts:
	public/tplan/code/database.php
updated database.php