More mode=xml accommodation & refactorin' + minor fix to ChallengeUser
Merge branch 'master' of https://github.com/aidendeom/soen387-a1