Retriving new datas
conflicts
Fray issues
Merge branch 'master' of https://github.com/fray88/SocialUp