Merge branch 'master' of github.com:belgianpolice/internet-platform
re #702 - Removed override for 5888
Merge branch 'master' of github.com:belgianpolice/internet-platform
Merge branch 'master' into staging
Merge branch 'staging' of github.com:belgianpolice/internet-platform into staging