added internal containerView to view hierarchy on cells
Merge remote-tracking branch 'upstream/master'