ff
Merge branch 'master' of github.com:anis-moubarik/SimpleREST into dev

Conflicts:
	README.md
	src/main/config/HEADER.txt