Fix all merge conflicts, add profile skeleton again, still needs work
Fix all merge conflicts, add profile skeleton again, still needs work

sf-red-pandas-2016/simul-react-native,sf-red-pandas-2016/simul-react-native,sf-red-pandas-2016/simul-react-native