設定タブでリサイズ後、テンプレートタグのレイアウトが崩れる問題を修正。
Merge remote-tracking branch 'origin/master'

Conflicts:
	hifive-template-editor/WebContent/css/index.css
	hifive-template-editor/WebContent/hifive/templateEditor/controller/TemplateEditController.js
	hifive-template-editor/WebContent/index.html
Merge branch 'master' of
https://github.com/hifive/hifive-template-editor

Conflicts:
	hifive-template-editor/WebContent/hifive/templateEditor/controller/SourceEditorController.js