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