Merge branch 'master' of https://github.com/qreal/qreal

Conflicts:
	qrgui/qrgui_ru.qm
	qrgui/qrgui_ru.ts
Merge branch 'master' of https://github.com/IlyaSmirnov/qreal

Conflicts:
	qrgui/qrgui_ru.ts