bb now has avatars, messing up the html regex parsing
Merge branch 'master' into fp