BZ-9196 added modals
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	src/main/js/noesis/bootstrap/portfolio/controllers/portfoliosViewController.js
	src/main/js/noesis/bootstrap/portfolio/directives/portfolio.html
BZ-9196 added modals
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	src/main/js/bootstrap.deps.js
	src/main/js/noesis/bootstrap/portfolio/controllers/portfoliosViewController.js
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	src/main/js/bootstrap.deps.js
BZ-9196 added modals
BZ-9196 fixed modals