Item class created
Merge remote-tracking branch 'origin/master'

Conflicts:
	NightfalloftheFinalConquer/Game/src/main/res/layout/activity_map.xml
Merge branch 'master' of https://github.com/marcelfarres/UPF.HCI.SaladKingdom

Conflicts:
	NightfalloftheFinalConquer/Game/src/main/res/layout/activity_map.xml