Updates for new api features
Merge branch 'master2' of https://github.com/pshep/ANUBIS

Conflicts:
	hoststat.php