Adding settings sync
Merge branch 'master' of github.com:MohamedBassem/CSEN704
Fixing profile activity