[다혜] item image 생성
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/js/controllers/templateEditor.js
Merge remote-tracking branch 'origin/master'