Ora modifica
Merge remote-tracking branch 'origin/new_origin' into new_origin

Conflicts:
	HSA/project.properties
	HSA/res/menu/deck_menu.xml