Merge in development
Complete pretty url functionality