поправил SQL
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit b6545a66dbe3c37e15b3eb22b856b57d1f8b063e.