Merge pull request #22 from felixsoum/backend-dev

Backend dev
Merge pull request #25 from felixsoum/backend-dev

Backend dev
Merge pull request #27 from felixsoum/backend

Backend