Working on social feature
Finished the new social feature
Merge branch 'feature-social' into development