Added DB Functions
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/db.php