Merge branch 'ruben' into develop
Frontend work
Merge branch 'ruben' of https://github.com/hashie5/app into hasselt
Frontend work
Merge branch 'hasselt' into develop
Frontend work
Merge branch 'hasselt' into develop
Merge branch 'ruben' into develop
Merge branch 'develop' of https://github.com/hashie5/app into develop
Merge branch 'develop' into ruben