More changes to URL's to work when the application is in a subdirectory.
Merge branch 'ted'