Merge branch 'trik_interpreter' of git://github.com/Ashatta/qreal into text-language-fixes
Merge branch 'master' of https://github.com/qreal/qreal into text-language-fixes
Advanced lexer error reporting
Merge branch 'master' of https://github.com/qreal/qreal into text-language-fixes

Conflicts:
	qrtest/unitTests/qrtextTests/luaParserTest.cpp
Merge pull request #1376 from qreal/text-language-fixes

Text language fixes