Modified templaterender for error with CF in phpldapadmin
Merge remote-tracking branch 'origin/master'