JAXB correction, default parameters
Merge branch 'first_version' of git@github.com:smartcampuslab/smartcampus.service.trentinofamiglia.git into first_version
ignore files
Merge branch 'first_version' of git@github.com:smartcampuslab/smartcampus.service.trentinofamiglia.git into first_version
Merge branch 'first_version' of git@github.com:smartcampuslab/smartcampus.service.trentinofamiglia.git into first_version
Merge branch 'first_version' of git@github.com:smartcampuslab/smartcampus.service.trentinofamiglia.git into first_version
Merge branch 'first_version' of github.com:smartcampuslab/smartcampus.service.trentinofamiglia into first_version
merge
Merge branch 'first_version' of
github.com:smartcampuslab/smartcampus.service.trentinofamiglia into
first_version

Conflicts:
	pom.xml
	src/main/resources/service/trentinofamiglia/interface.xml