Finally fixed broken ass js indentation
Merge branch 'master' into linny