izm
commit
dobavil new combobox
com
Merge remote-tracking branch 'refs/remotes/origin/Qml-vadim' into QML-dev

Conflicts:
	AS_formsLast/AComboBox.qml
	AS_formsLast/AS_forms.pro
	AS_formsLast/NewAComboBox.qml
	AS_formsLast/Words.s3db
	AS_formsLast/baza.cpp
	AS_formsLast/baza.qml
	AS_formsLast/resourses.qrc
Revert "Merge remote-tracking branch 'refs/remotes/origin/Qml-vadim' into QML-dev"

This reverts commit e1e3515cc373e1acd657cd4107791479f3f2b31c, reversing
changes made to 1cc38a316f7c8e393fc9c77dd44090e9d2909b2e.
add
Merge remote-tracking branch 'refs/remotes/origin/QML-dev' into QML-dev
Merge remote-tracking branch 'refs/remotes/origin/new-qml-vadim' into QML-dev
Merge remote-tracking branch 'refs/remotes/origin/Qml-vadim' into QML-dev

Conflicts:
	AS_formsLast/AComboBox.qml
	AS_formsLast/AS_forms.pro
	AS_formsLast/NewAComboBox.qml
	AS_formsLast/Words.s3db
	AS_formsLast/baza.cpp
	AS_formsLast/baza.qml
	AS_formsLast/resourses.qrc (reverse-merged from commit e1e3515cc373e1acd657cd4107791479f3f2b31c)