Laten we hopen dat er niets mis gaat...
Merge branch 'master' of https://github.com/TijsDelvaux/PikaCHI.git

Conflicts:
	stEDUnt/app/controllers/Application.java
	stEDUnt/app/views/viewAdvertisements.scala.html
	stEDUnt/conf/routes