Connected frontend and backend
Merge branch 'master' into admin