Script aggiornato
Merge branch 'master' of https://github.com/mobilejedi/StampIt

Conflicts:
	SQL/stampit_db.sql
Merge branch 'master' of https://github.com/mobilejedi/StampIt

Conflicts:
	SQL/stampit_db.sql