笔记元件 显示标题 改i18nkey
vr 720 smarty 增加一参数
Merge branch 'master' of https://github.com/wofeiwofeifeifei/html5Gen

Conflicts:
	application/views/components/note.php
temp