cleanup unused arguments
Merge branch 'master' of github.com:databrary/databrary

Conflicts:
	app/assets/decorator/resourceDecorator.js