removing test buttons, oops
Merge branch 'master' into feature_570_page_drafts
Merge branch 'master' into feature_507_snippets
Merge branch 'feature_570_page_drafts' into master_candidate
Merge branch 'feature_507_snippets' into master_candidate