Merge branch 'master' of https://github.com/ioramashvili/Urbanpedia

Conflicts:
	app/src/main/res/drawable-hdpi/clothes.png
	app/src/main/res/drawable-mdpi/clothes.png
	app/src/main/res/drawable-xhdpi/clothes.png
	app/src/main/res/drawable-xxhdpi/clothes.png
	app/src/main/res/drawable/new3.png
	app/src/main/res/layout/gift_item.xml