Functions v 0.22

MAJOR CHANGES
LIFE CHANGING CHANGES
DO NOT REVERT TO PREVIOUS VERSIONS
I REPEAT DO NOT REVERT
Merge remote-tracking branch 'origin/master'

Conflicts:
	api/functionsv1.php