Setup friends and inbox fragments
Further refined fragment setup
Merge branch 'master' into ForgotPasswordFeature

Conflicts:
	app/src/main/res/values/strings.xml