Menu overflow
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/menu/team_building.xml
Merge remote-tracking branch 'upstream/master' into qr