fix typo in template
fix search
more logical permission code
fix wrong handling with ldap expiration date
fix merging
display expiration date in profile
Merge branch 'hotfix/1.1.3' into develop