artiest.jsp
Merge branch 'KalenderSetup' of https://github.com/utwente-di/di17 into KalenderSetup

Conflicts:
	Calendar/src/main/java/controller/RestController.java