update routes
Merge branch 'master' of https://github.com/chriscx/Disko
cleaning up code
fixed js dependencies & collapse action