Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Update from upstream
Merge remote-tracking branch 'upstream/develop' into develop
Add TalkAboutFriendsFamily
Merge remote-tracking branch 'upstream/develop' into develop
merge from upstream
merge from upstream
merge from upstream
merge from upstream
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
merge from upstream and new TalkAbout
Merge remote-tracking branch 'upstream/develop' into develop
new changes
merge from upstream
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	user/Activities.xml
merge