Search merge with AddStudent
Merge branch 'patrikmerge' into dev