Merge branch 'master' into Authentication
Merge branch 'Authentication' of https://github.com/RudigerRoach/301_main_emma into Authentication