Merge branch 'master' into step_titles

Conflicts:
	src/test/javascript/portal/details/DetailsPanelSpec.js
	web-app/js/portal/details/DetailsPanel.js
	web-app/js/portal/lang/en.js