Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/runConfigurations/CollaboRhythm_Tablet___Emulator__Tab_1280_x_752_.xml
	HW2013Hypertension.Plugins.Problems.Hypertension/src/hw2013Hypertension/plugins/problems/hypertension/view/HypertensionChartsView.mxml
Merge remote-tracking branch 'origin/master'