ыарвп
Merge remote-tracking branch 'origin/master'

Conflicts:
	Graph_framework.pro.user
	mainwindow.cpp