adapting api to new disposition
moving down under classes
Merge branch 'userActivation' of github.com:AlessandroMamusa/share-system-team1 into userActivation