Merge tag '1.1.3' into develop

Add wysiwyg editor

* tag '1.1.3':
add google analytics
Merge branch 'release/1.1.4'

* release/1.1.4:
  add google analytics