dev changes
added bookmarklet to settings page
Merge branch 'bookmarklet'