scoreboard_update
Merge branch 'scoreboard_update' into Version1.0

Conflicts:
	gen/com/klabcyscorpions/boom/R.java
	res/layout/fragment_list.xml