Added stacking support for conversation replies
Fixed stacking
Fixed some minor issues
Merge branch '2.1' into notifications