Fixed datasources
Merge branch 'master' of github.com:Coffei/PeakTogether
Merge branch 'master' of github.com:Coffei/PeakTogether
Renamed User to Member