temp files removed
Merge branch 'frontend-new' into develop
refactoring