Merge branch 'hotfix-0.10.1'
added analysis data route and controller
updated gems
analysis data file not found error message improved
Merge branch 'release-0.11.2'
Merge branch 'release-0.11.3'
Merge branch 'master' into feature-analysis-api
updated gems
Merge branch 'develop' into feature-analysis-api

Conflicts:
	config/settings/default.yml
fixed up analysis data api tests
Merge branch 'develop' into feature-analysis-api

Conflicts:
	Gemfile.lock
	config/routes.rb
fixes for media and analysis tests
more analysis_controller tests; fix library paged api error (see #128); fix site json structure closes #135
Merge branch 'feature-analysis-api' into develop