Fix patients page multirender
Merge branch 'master' into integration

Conflicts:
	phpsql