QA2 base screen shot
Merge remote-tracking branch 'origin/master'

Conflicts:
	base_health_qa2.png