Temporary solution for student app crashing
Merge remote-tracking branch 'origin/master'