Updates js code from the develop branch
Updates less source from develop branch
Cleanup