test
Merge remote-tracking branch 'origin/grafon' into grafon

Conflicts:
	db.sqlite3
рега + лог
Merge remote-tracking branch 'origin/grafon' into grafon