Merge branch 'master' of https://github.com/savvavolobuev/Teleproject

Conflicts:
	app/src/main/java/fl/developer/teleproject/model/Data.java