Solve issue of xeditable and few changes in messaging
Merge branch 'master' of
https://github.com/EVRI-TEAM/Evri_Charity-Portal

Conflicts:
	WebContent/dataentryform.html