Consolidated BookmarkAdd into BookmarkEdit.

git-svn-id: https://svn.apache.org/repos/asf/roller/trunk@1616263 13f79535-47bb-0310-9956-ffa450edef68