Merge branch 'master' into feature4401
enhancing xmlcomponent of LDAP-based organizationchart
closing feature #4401
on feature #4401, fixing CSS problem
Merge branch 'master' into feature4401
on feature #4401, adding new app icon
Merge branch 'feature4401'