Merge remote-tracking branch 'pc/jb2' into pa_barracuda

Conflicts:
	src/com/brewcrewfoo/performance/service/BootService.java