added wysiwyg
checkout back to messages to pull changes
Merge branch 'messages'
deploy config