хз
sf

Conflicts:
	device/app/Screen/Technics/GSM.xml
	device/app/Screen/Technics/GSMs.xml
	device/app/Style/Default/Waybill.css
	device/app/Translation/en.txt
	device/app/Translation/ru.txt
Merge remote-tracking branch 'origin/Develop_Ivan' into Develop_AVMurach

Conflicts:
	device/app/Translation/en.txt
	device/app/Translation/ru.txt
потерянный DoAction
Technics.xml done
Merge remote-tracking branch 'origin/Develop_AVMurach' into Develop_Ivan
Fix Technics/Main.js
Fixes