called from script
Merge branch 'master' of https://github.com/imp-partner-test/IMP-RSH

Conflicts:
	apiary.apib