core-4692 update buttons to OK/Cancel
core-4690 update feedback button
CORE-4686 add intro to forums link
Merge branch 'master' into STABLE