Committing all unstaged changes.
Merge branch 'fixes/about-rrLink-wysihtml5'