#517: canonical URL usage updated.
Merge branch 'dev' of ssh://github.com/devbridge/BetterCMS into dev