Minor api updates
Merge branch 'master' of github:databrary/design

Conflicts:
	api-spec.txt
Update api to d4a20b2