Merge branch 'master' of https://github.com/artemk1/furry-bear

Conflicts:

.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt
.core.external.folders/.markers.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt
.core.external.folders/.syncinfo.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/RealEstate/.mark
ers.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/RealEstate/.sync
info.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.ma
rkers.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.sy
ncinfo.snap

.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.
index
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/1.tree

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.jdt.core/3213189358.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
Merge branch 'master' of https://github.com/artemk1/furry-bear

Conflicts:

.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt
.core.external.folders/.markers.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt
.core.external.folders/.syncinfo.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/RealEstate/.mark
ers.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/RealEstate/.sync
info.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.ma
rkers.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.sy
ncinfo.snap

.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.
index
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/1.tree

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.jdt.core/3213189358.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt