# Conflicts:
#	pom.xml
#	src/main/java/org/olat/core/gui/components/ComponentRenderer.java
#	src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/JSDateChooserRenderer.java
#	src/main/java/org/olat/core/servlets/HeadersFilter.java
#	src/main/java/org/olat/course/nodes/GTACourseNode.java
#	src/main/java/org/olat/course/nodes/gta/manager/GTAManagerImpl.java
#	src/main/java/org/olat/repository/ui/author/AuthorListController.java
#	src/main/webapp/static/js/js.plugins.min.js