fixed test file differences, now doesn't call create_user
Merge branch 'userActivation' of github.com:AlessandroMamusa/share-system-team1 into userActivation