Merge remote-tracking branch 'upstream/master'

Conflicts:
	pom.xml
	src/main/java/com/welovecoding/tutorial/api/FHBRestRedirectServlet.java
	src/main/java/com/welovecoding/tutorial/api/v1/dto/PlaylistDTO.java
	src/main/java/com/welovecoding/tutorial/view/auth/AdminPagesFilter.java
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/imprint.xhtml
	src/main/webapp/resources/less/frontend/general.less
	src/main/webapp/resources/less/frontend/grids/grid-welcome-teaser.less
	src/main/webapp/team.xhtml
	src/main/webapp/videos.xhtml
	src/test/java/com/welovecoding/entities/PlaylistTest.java