cleanup
adding feedback modal, fixes #32, #33, #34, #35
Merge branch 'staging' into ofr