Revert to a more stable version of the feedback plug-in.
Move some stuff around.
Make the COM C++ interfaces public.
Indentation changes.
Merge branch 'master' into UnstableFeedback
Minor changes