corrected bug
modified tables constraints
merge conflicts
implemented new methods
Merge branch 'master' of https://github.com/glukas/Social