fixing additional email popup, no ticket filed
fixing count bubble counters, no ticket filed
fixing multiassign issues, no ticket filed
Merge branch 'dev' into test
Merge branch 'test' into prod