js bookmarks fix
js notifications order
Merge branch 'master' into future