Merge branch 'master' of https://github.com/kbrs/iodocs

Conflicts:
	public/data/kbapi.jsonAdded the rest of the parameters to the APIAdded the rest of the parameters to the API