tp
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Stay-Together/app/src/main/AndroidManifest.xml