TrailingSlash filter
Merge branch 'royal' into develop
fixed auth
Merge branch 'develop'