今天Pull了一次，更新了很多東西的樣子
更新Annotation_list顯示筆記的方式
Merge branch 'master' of https://github.com/pulipulichen/kals

Conflicts:
	system/application/views/web_apps_release/annotation_param/Annotation_param.js