AOP bug fixed + ServerTest code refactoring
Merge branch 'master' of https://github.com/hrougier/workspace