Merge pull request #49 from felixsoum/frontend-dev

Frontend dev
Merge branch 'frontend' into backend