ä
Merge branch 'master' of github.com:anis-moubarik/SimpleREST

Conflicts:
	src/main/config/THIRD-PARTY.properties