updates
Merge branch 'master' of https://github.com/hubgit/libapi

Conflicts:
	API.php
	lib/functions.php