Bug fixing.
Merge branch 'master' of https://github.com/photon-infotech/framework

Conflicts:
	phresco-framework-web/src/main/webapp/components/login/test/BootstrapTest.js