fixed naive use of uri from payload
Merge branch 'RC1/master' into templating
WIP full width article template