BZ-9196 delete portfolio Error panel
BZ-9196 delete portfolio Error panel
Merge remote-tracking branch 'refs/remotes/origin/master'
BZ-9469 added layout
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	src/main/js/bootstrap.deps.js
	src/main/js/noesis/bootstrap/Entry.js