update api test
Merge branch 'master' into forAGOL

Conflicts:
	index.html