Merge branch 'master' of github.com:boersmamarcel/challengesplatform into 95
Revert "Merge branch 'master' of github.com:boersmamarcel/challengesplatform into 95"

This reverts commit 32ebf83e6a47087bacbe5f90c48587f45a0e1877, reversing
changes made to 4ca36a5548aed2c37eb937cdf666c6196a91c8e7.
Merge branch '95' of github.com:boersmamarcel/challengesplatform into 95