[flatmates] Sprite changes
Merge branch 'master' of https://github.com/andreiagaita/PersonalSpaceInvader
[flathunt] apartment2 scene updated
Merge branch 'master' of https://github.com/andreiagaita/PersonalSpaceInvader

Conflicts:
	flatmates/Assets/Scenes/apartment2.unity
Merge remote-tracking branch 'origin/master'

Conflicts:
	flatmates/Assets/Sprites/Furniture/Kitchen/chairFront.png.meta
	flatmates/Assets/Sprites/Furniture/Kitchen/chairSide.png.meta
	flatmates/Assets/Sprites/Furniture/Kitchen/cupboardCorner.png.meta
	flatmates/Assets/Sprites/Furniture/Kitchen/cupboardOpen.png.meta
	flatmates/Assets/Sprites/Furniture/Kitchen/cupboardReverse.png.meta
	flatmates/Assets/Sprites/Furniture/Kitchen/cuttingBoard.png.meta
	flatmates/Assets/Sprites/Furniture/Kitchen/knifeRack.png.meta
	flatmates/Assets/Sprites/Furniture/Kitchen/plates.png.meta
	flatmates/Assets/Sprites/Furniture/Kitchen/sink.png.meta
	flatmates/Assets/Sprites/Furniture/Kitchen/table.png.meta
	flatmates/Assets/Sprites/Furniture/Kitchen/trashCan.png.meta
	flatmates/Assets/Sprites/Furniture/Kitchen/veggies.png.meta
	flatmates/Assets/Sprites/Furniture/Kitchen/wallpaper.png.meta
	flatmates/Assets/Sprites/Furniture/Living Room.meta
	flatmates/Assets/Sprites/Furniture/Living Room/cornerSofa.png.meta
	flatmates/Assets/Sprites/Furniture/Living Room/pouffe.png.meta
	flatmates/Assets/Sprites/Furniture/Living Room/sofaBack.png.meta
	flatmates/Assets/Sprites/Furniture/Living Room/tvTable.png.meta
	flatmates/Assets/Sprites/Furniture/Room B.meta
	flatmates/Assets/Sprites/Furniture/Room B/bed.png.meta
	flatmates/Assets/Sprites/Furniture/Room B/cardboardBox.png.meta
	flatmates/Assets/Sprites/Furniture/Room B/closetBack.png.meta
	flatmates/Assets/Sprites/Furniture/Room B/closetSide.png.meta
	flatmates/Assets/Sprites/Furniture/Room B/desk.png.meta
	flatmates/Assets/Sprites/Furniture/Room B/electricalSocket.png.meta
	flatmates/Assets/Sprites/Furniture/Room B/pedestalThingy.png.meta
	flatmates/Assets/Sprites/Furniture/Room B/vlambeerPoster.png.meta
	flatmates/Assets/Sprites/Furniture/Room B/wallpaper.png.meta
	flatmates/Assets/Sprites/Players/players_idle.png.meta