cleaned up
Merge branch 'master' of github.com:next-l/enju_bookmark