Improve pre-report...
Merge branch 'master' of https://github.com/popmedic/epcr

Conflicts:
	pre-report/server/getClientNameWithId.php
	pre-report/server/include/config.inc.php