js fully debugged
Merge branch 'frontend'