model
Merge branch 'master' of https://github.com/gdrvce/JSFTest

Conflicts:
	PIA_fax/src/main/resources/rebel.xml