js test maven plugin issue fixed
Merge branch 'master' of https://github.com/photon-infotech/framework

Conflicts:
	phresco-framework-web/src/main/webapp/components/login/test/BootstrapTest.js
jstest maven plugin issues fixed
artf738481: js test maven plugin 3.0 js unit test issue fixed
Merge branch 'master' of https://github.com/photon-infotech/framework