Fix bugs introduced with last fix (split BASE_URL into BASE_URL  and ASSETS_URL)
Merge remote-tracking branch 'origin/master'