cleanp: bookmarks
Merge branch 'edge'
Merge branch 'edge' of github.com:webnotes/wnframework into edge