Configuration variables. Use @@CSS_BASE_URL and @@JS_BASE_URL and make sure these are set in your environment vars
Merge remote-tracking branch 'origin/master'