sql functions
Merge remote-tracking branch 'origin/master'

Conflicts:
	inc/functions.php