Fix to allow script files to use base_url and site_url
Merge branch 'pratik'