Removed id from bookmarks add
Changed OTR policy allow V1 and V2
Merge branch 'master' into plugins