Merge remote-tracking branch 'origin/dev'
Fix some security flaws in user bookmarks
Add is_object check
Flush bookmarks fragment when adding or removing a bookmark
Updated permissions
Merge branch 'master' of 198.101.151.217:cgc-user-bookmarks
Fix bad return statement before restore_current_blog that caused the wrong blog ID to be set on users that had improper metadata
Fix merge conflict
use var directly