change wysiwyg override feature to master
Merge branch 'master' of github.com:gsbitse/gsb_public