myProfile.js update
Merge remote-tracking branch 'origin/DEMO2' into DEMO2

Conflicts:
	src/main/webapp/WEB-INF/pages/layout/layout.jsp