test invitation
resolved conflicts
removed french javadoc...
Merge branch 'master' of https://github.com/OpenComm/OpenComm-Group