Fix javascript base URL to really work
Merge branch 'subdir-deploy'