item: text, link 생성
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/component/templatePanel/component.js