Merge +millennium & sniggle's bookmarks

Merge +millennium & sniggle's bookmarks
Updated changelog
Updated version to 2.01.5(alpha)