Advertenties oke
Merge branch 'master' of https://github.com/TijsDelvaux/PikaCHI.git

Conflicts:
	stEDUnt/app/controllers/Application.java
	stEDUnt/app/models/StudentAdvertisement.java