Merge remote-tracking branch 'origin/master'

pom.xml

@@ -62,6 +62,12 @@
   		<artifactId>cglib</artifactId>
   		<version>2.2.2</version>
   	</dependency>
+  	<dependency>
+  		<groupId>de.thm.arsnova</groupId>
+  		<artifactId>arsnova-legacy-js</artifactId>
+  		<version>1.0.0-SNAPSHOT</version>
+  		<type>war</type>
+  	</dependency>
   </dependencies>
   <build>
   	<plugins>

src/main/webapp/WEB-INF/arsnova-servlet.xml

@@ -13,12 +13,17 @@
 
 	<mvc:resources mapping="/**.html" location="/" />
 	<mvc:resources mapping="/**.png" location="/"/>
+	<mvc:resources mapping="/**.manifest" location="/"/>
 	<mvc:resources mapping="/config.json" location="/"/>
+	<mvc:resources mapping="/config.xml" location="/"/>
 	<mvc:resources mapping="/dojo/**" location="/dojo/"/>
 	<mvc:resources mapping="/dijit/**" location="/dijit/"/>
 	<mvc:resources mapping="/dojox/**" location="/dojox/"/>
 	<mvc:resources mapping="/app/**" location="/app/"/>
 	<mvc:resources mapping="/views/**" location="/views/"/>
+	<mvc:resources mapping="/lib/**" location="/lib/"/>
+	<mvc:resources mapping="/resources/**" location="/resources/"/>
+	<mvc:resources mapping="/screenshots/**" location="/screenshots/"/>
 	
 	<mvc:annotation-driven />