updated layout and made Scoreboard activity static
Merge branch 'master' of github.com:dloman/OpenScoreboard

Conflicts:
	src/com/openscoreboard/ScoreboardActivity.java