Merge branch 'hotfix/41'
Merge branch 'develop'
keyboard is now dismissed on discard tap
Merge branch 'hotfix/47' into develop