Adding fixes for upload buttons, changing to text link
Adding fix for blockquotes
Merge branch 'css-and-template-bugfixes' into development