[flatmates] Apartment2 and player prefab fixes
sprite meta updated
Merge branch 'master' of https://github.com/andreiagaita/PersonalSpaceInvader

Conflicts:
	flatmates/Assets/Sprites/Furniture/general carpet.png.meta
	flatmates/Assets/Sprites/HUD.meta
	flatmates/Assets/Sprites/HUD/hud example.png.meta
	flatmates/Assets/Sprites/HUD/objective.png.meta
	flatmates/Assets/Sprites/HUD/score thingy.png.meta