Allow upper and lower-case letters in short url's
Update to base-1.5.2.jar
Bring latest changes on master into the unimelb branch