sorting op homepage
Merge pull request #259 from svdvonde/master

Issue 257 (gesorteerde programma's/trajecten op homepage) opgelost
Bootstrap Modal Alerts: Opschonen alert + integratie Pusher Alerts
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone

# By Sam
# Via Christophe Gaethofs (1) and others
* 'master' of https://github.com/CalZoneVUB/CalZone:
  sorting op homepage
Merge pull request #260 from gaethofs/master

Paginamedelingen
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
Conflict Message