fixed comma alignment on merge patients page
Merge branch 'master' of https://github.com/openmrs/openmrs-module-coreapps

Conflicts:
	omod/src/main/webapp/pages/mergeVisits.gsp
added French and Kreyol translations for merge visits page