Merge remote-tracking branch 'origin/master'

Conflicts:
	HW2013Endometriosis.Plugins.Problems.Endometriosis/src/hw2013Endometriosis/plugins/problems/endometriosis/view/PainEvaluationView.mxml
Merge remote-tracking branch 'origin/master'
made a whole bunch of formatting changes - changed background colors and made PainEvaluation screen have bigger buttons.

Also, video should theoretically play. And changed a few icons.
Merge remote-tracking branch 'origin/master'

Conflicts:
	HW2013Endometriosis.Plugins.Problems.Endometriosis/src/hw2013Endometriosis/plugins/problems/endometriosis/view/PreOpEvaluationView.mxml
	HW2013Endometriosis.Plugins.Problems.Endometriosis/src/hw2013Endometriosis/plugins/problems/endometriosis/view/VaginalBleedingEvaluationView.mxml