Merged in chris's branch
Fixed nested weights and content description warnings
Added in team name to title screen
Merge remote-tracking branch 'origin/master' into chris

Conflicts:
	res/layout/activity_title.xml
	res/values/strings.xml
Merge remote-tracking branch 'origin/master' into chris
minor bug