follows FULL
Merge branch 'master' of https://github.com/dadaoros/socialEngine