Changed editor to wysiwyg module and tinymce
jan 25
Merge branch 'devbranch'