Modified LDAP configuration
Resolved bug Logout button firefox
Merge branch 'master' into sigmaportal

Conflicts:
	web/src/main/webResources/WEB-INF/applicationContext.xml