Initial commit of the frontend
Merge branch 'master' into develop