oops, forgot to pull before some changes.
Merge remote-tracking branch 'origin/iOS' into iOS
Fully separated student and lecturer flows, student and lecturer image view controllers now used instead of generic