Formatting.
Merge branch 'develop' of github.com:EsupPortail/esup-opi into develop
Finished Icescrum#144
Merge branch 'develop' of github.com:EsupPortail/esup-opi into develop
Merge branch 'gh_issue_88' into develop

Conflicts:
	esup-opi-domain-services/src/main/java/org/esupportail/opi/domain/DomainApoServiceImpl.java