update
Merge branch 'master' of https://github.com/hdmaker/amt-project

Conflicts:
	amt_project/src/main/java/api/OrganizationRessource.java