some cleanup
startup diploma user story
Merge branch 'dev-fre' into ctb-cv-app-dev