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