Changed url patterns for pushstate
Merge branch 'develop' into feature/630-633-pushstate-tweaks
Merge branch 'feature/630-633-pushstate-tweaks' into develop