update functions.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	htdocs/public/js/functions.js