[flatmates] item pickup fixed
Merge branch 'master' of https://github.com/andreiagaita/PersonalSpaceInvader

Conflicts:
	flatmates/Assets/Scripts/PlayerController.cs