Merge remote-tracking branch 'origin/master'

Conflicts:
	HW2013Hypertension.Plugins.Problems.Hypertension/src/hw2013Hypertension/plugins/problems/hypertension/view/HypertensionView.mxml
Merge remote-tracking branch 'origin/master'