update api
Merge remote-tracking branch 'origin/master' into forAGOL

Conflicts:
	index.html