Merge pull request #10 from ryuuzakiupldr/master

Big merge
follows FULL
Merge branch 'master' of https://github.com/dadaoros/socialEngine
Merge pull request #6 from dadaoros/master

duplacate follows fixed