Merge branch 'dev' into version2
Updated StudentViewController
Merge branch 'version2' into dev