views
test
Merge branch 'master' of https://github.com/Kadrei/SerienCalender-Client

Conflicts:
	src/seriencalender/client/controller/FrontController.java