Вот
Merge pull request #1 from tehfreak/dev-0.0.21

v0.0.19
Убрал пустые файлы из бекапа. Убрал лишнее из бекапа.
Merge pull request #2 from tehfreak/master

v0.0.19
Merge branch 'master' into dev-0.0.21

Conflicts:
	db/dump/datasheet_datasheet.sql
	db/dump/datasheet_datasheet_devices.sql
	db/dump/datasheet_device_devicemode.sql
	db/dump/datasheet_device_deviceprops.sql
	db/dump/datasheet_device_devicetype.sql
	db/dump/datasheet_devicemode.sql
	db/dump/datasheet_devicemode_deviceprop.sql
	db/dump/datasheet_deviceprop.sql
	db/dump/datasheet_devicetype_devicemodes.sql
	db/dump/datasheet_devicetype_deviceprop.sql