Merge remote-tracking branch 'remotes/origin/master' into angular

Conflicts:
	app/views/angular/controllers/toolbarCtrl.scala.html
	app/views/widget/template/crud.scala.html
support for words on browser tools; edit icon for item editing
Merge branch 'angular' of https://github.com/databrary/databrary into angular