Merge branch 'ruben' into develop
Merge branch 'ruben' into develop
Merge branch 'ruben' into develop
Merge branch 'ruben' of https://github.com/hashie5/app into dennis
Update backend
update frontend
update frontend
update frontend
Merge branch 'dennis' into develop
Update frontend
Merge branch 'ruben' into develop
Merge branch 'develop' of https://github.com/hashie5/app into develop
Merge branch 'develop' into ruben