added timymce
Merge branch 'user-profile-edit' into user-profile-view
added tinymce