listofspec
listofspec
Merge branch 'master' into listofspec

Conflicts:
	static/api.json
fix listofspec