Merge branch 'PM2Way' of https://github.com/NoesisEnergy/bootstrap into PM2Way
BZ-12700 check for sync status
Merge branch 'PM2Way' into integration

Conflicts:
	src/main/js/noesis/bootstrap/portfolio/templates/portfolio.html
BZ-12700 fixed wrong merge