Conflicts:
	pom.xml
	src/main/java/de/thm/arsnova/controller/LoginController.java
	src/main/java/de/thm/arsnova/dao/CouchDBDao.java
	src/main/java/de/thm/arsnova/services/SessionService.java
	src/main/java/de/thm/arsnova/services/StatisticsService.java
	src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
	src/main/webapp/WEB-INF/spring/arsnova-servlet.xml
	src/main/webapp/WEB-INF/spring/spring-main.xml
	src/main/webapp/WEB-INF/spring/spring-security.xml
	src/main/webapp/arsnova.properties.example
	src/test/resources/arsnova.properties.example

Replaced the use of Json-lib for deserialization by the use of a Map.
This fixes exceptions caused by failed deserializations and is more
consistent with JSON handling of other controllers.
Log messages for easier debugging have been added.

This reverts commit 8c8412bb.

This commit is no longer needed since the missing view has been reimplemented.

* Do not include Mobile in WAR
* Deploy frontends and customization to their own contexts in dev env
* Update Connector and Jetty dependencies

The creator name is only visible to the creating user itself.

Variable für Schwellwert zur richtigen Beantwortung einer Planquadratfrage im Backend implementiert.

CouchDBDao und Question-Entity um neue Attribute fuer Toggle Anzahl Markierungen aufheben erweitert.