DS-1144 Corrected Databrowser breadcrumbs to display useful information when using search
Merge branch 'master' of https://github.com/inbloomdev/datastore into DS-1144
Cleaned up databrowser tests for ssp
Merge branch 'master' of https://github.com/inbloomdev/datastore into DS-1144

Conflicts:
	sli/databrowser/app/controllers/application_controller.rb
DS-1144 Added search to breadcrumbs
Merge branch 'master' of https://github.com/inbloomdev/datastore into DS-1144
Use token generator for acquiring API token instead of UI
Merge branch 'osi-dev-master' into DS-1144

Conflicts:
	sli/acceptance-tests/test/features/databrowser/databrowser_breadcrumbtrail.feature
	sli/databrowser/app/controllers/application_controller.rb
Merge branch 'master' into DS-1144
Fixed breadcrumb test and changed text for links
Merge branch 'osi-dev-master' into ds991

Conflicts:
	sli/acceptance-tests/test/features/databrowser/step_definitions/databrowser_simpe_detail_steps.rb