Merged Nicks changes to matches and preferences. Started facebook and cognito integration