BZ-8668 auth flow
Merge remote-tracking branch 'refs/remotes/origin/pm2waySync' into pm2waySync

Conflicts:
	src/main/js/noesis/bootstrap/portfolio/controllers/portfolioController.js