Shortening "Now editing" URL even more
Merge branch 'dev' into gh-pages