fix bugs
Merge branch 'master' of https://github.com/argen666/SibekParus

Conflicts:
	build/intermediates/model_data.bin
Merge branch 'master' of https://github.com/argen666/SibekParus

Conflicts:
	build/intermediates/model_data.bin
Merge branch 'master' of https://github.com/argen666/SibekParus

Conflicts:
	app/build/generated/source/r/debug/ru/sibek/parus/R.java
	build/intermediates/model_data.bin
fix sync bug