All frontend completed
All front end completed
Merge branch 'newfrontend'