Merge branch 'dev' into style-updates
Adjusting styles and markup on approve feed result state - button and
link styles
Merge branch 'style-updates' into dev