ticket:6 add caption edit page
Merge remote-tracking branch 'remotes/origin/ticket_6' into ticket_8