Merge branch 'master' of /home/nishara/PycharmProjects/yadi with conflicts.
Merge remote-tracking branch 'origin/master'
query evaluation
Merge remote-tracking branch 'origin/master'

Conflicts:
	yadi/TranslationWrapper/translateDatalogToSQL.py
	yadi/TranslationWrapper/translationTests.py
	yadi/sqlGeneratorTests.py
query evaluation
Merge remote-tracking branch 'origin/master'