Prepared canteen student verification
Keep android files sorted
Merge branch 'master' into pilot