changes to generator info
Merge remote-tracking branch 'origin/master'

Conflicts:
	util.js
generate endpoint