a
Merge remote-tracking branch 'origin/master' into RoccoL

Conflicts:
	CharityWorkout/gen/com/c1/charityworkout/R.java