update ui and database interaction
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/it/polimi/game/model/GameHandler.java
	app/src/main/java/it/polimi/game/persistence/DatabaseHelper.java
update ui and database interaction