Merge branch 'daniel/project-list'