Added feedback button
Merge branch 'master' of github.com:harmonicnw/fhsapp_admin