fixing issues.
Merge branch 'master' of https://github.com/gemy21ce/mek

Conflicts:
	src/main/webapp/WEB-INF/i18n/messages_ar.properties
	src/main/webapp/WEB-INF/i18n/messages_en.properties
	src/main/webapp/WEB-INF/i18n/messages_fr.properties
	src/main/webapp/WEB-INF/jsp/ums/frontend/profile/profile.jsp