#17: Updating with Master code
Merge pull request #25 from dotCMS/issue-17-WYSIWYG

#17: Updating with Master code