Modified handling of duplicate users, added test for this
Merge branch 'master' of https://github.com/gathcon/Group3ProjectWeb