added ActivationService test and mokito to pom
Merge remote-tracking branch 'origin/master'