Merge branch 'website' into develop
Remove database file
Merge branch 'develop' into ruben
Frontend work