update
Merge remote-tracking branch 'origin/Kam1x_b'

Conflicts:
	JungleSpeed/res/layout/activity_play.xml
	JungleSpeed/src/com/vloprogrammers/speedmaster/PlayActivity.java