Moxy -> Jackson
Opruiming in de code
Merge branch 'feature/jackson' into develop