Upload
Merge branch 'master' of https://github.com/hujer/bz-api

Conflicts:
	apiary.apib