Added test for when autojoin no nick on /bookmark add
Merge branch 'master' into gmail