aggiornati repositories
Merge remote-tracking branch 'upstream/master'
note configurazioni
mdb2mysql.sh
Merge remote-tracking branch 'upstream/master'
script insert sql enums
Merge remote-tracking branch 'upstream/master'
mdb2mysql.sh: script per estrazione dati da mdb e inserimento in mysql e postgres
merge
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	docs/data/db/enums-insert.sql
mdb2mysql.sh: script per estrazione dati da mdb e inserimento in mysql e postgres
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/webapp/elaborazioni/flusso/A1.xhtml
README
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/fiorenzino/asr
merge
un po di conf
Merge remote-tracking branch 'upstream/master'

Conflicts:
	docs/standalone-asur.xml
	pom.xml
merge