applyed changes discussed
Merge branch 'master' of https://github.com/glukas/Social