Edit tab names
Merge remote-tracking branch 'origin/master'

Conflicts:
	FlamingOctopus/src/main/java/com/mobproto/flamingoctopus/MainActivity.java
	FlamingOctopus/src/main/java/com/mobproto/flamingoctopus/ScorboardListFragment.java
Fixed duplicate error