Merge branch 'master' of https://git.bukova.info/repos/git/isspst

src/main/webapp/WEB-INF/spring/root-context.xml

@@ -28,6 +28,7 @@
 				<value>/WEB-INF/ldap.properties</value>
 				<value>/WEB-INF/mail.properties</value>
 				<value>/WEB-INF/gmail.properties</value>
+				<value>/WEB-INF/ad.properties</value>
 			</list>
 		</property>
 	</bean>
@@ -137,9 +138,11 @@
 		<security:logout invalidate-session="true"/>
 	</security:http>
 
+	<!-- Authentication methods -->
 	<import resource="database-auth.xml"/>
+	<!-- <import resource="ldap-auth.xml"/> 
+	<import resource="ad-auth.xml"/> -->
 	<import resource="gmail-auth.xml"/>
-	<!-- <import resource="ldap-auth.xml"/> --> 
 		
 	<import resource="mail-services.xml"/>