Remove feedback button if fdbk could not be connected
Merge branch 'develop'