Updated toggle comment button.
Merge branch 'feature/comment_button' into develop
Merged and solved conflicts.