D-10

v-2.0
---
1. editable => Video.memo

     ==> done
D-11

MISC-1
v-1.0
---
1. add video  => onMouseOver

     ==> done
Merge branch 'D-10_video-memo_editable'

Conflicts:
	app/webroot/development.sqlite3
	app/webroot/js/main.js

 On branch master
 Your branch is ahead of 'origin/master' by 1 commit.
   (use "git push" to publish your local commits)

 All conflicts fixed but you are still merging.

 Changes to be committed:
	modified:   app/webroot/js/main.js