feedback btn + modal
fixing merge
Merge branch 'master' of https://github.com/jptr/HipMeBeta2