UPDATE GENERAL & EXECUTION & PLANNING
Merge remote-tracking branch 'origin/master'

Conflicts:
	vendor/hscstudio/yii2-heart/widgets/Modal.php