Merge branch 'dev' into patrikupload
Re-Add Create Student
Merge branch 'patrikupload' into dev