Updated the scResolveUrl.
Merged conflicts.
Compiled for production.