Pretty URLs
Merge branch 'development'
Dealing with merge conflicts