Merge branch 'master' into 1.5-dev

# Conflicts:
#	Classes/UITableView+FDTemplateLayoutCell.m

Author: sunnyxx

Classes/UITableView+FDTemplateLayoutCell.m

@@ -127,7 +127,7 @@ - (CGFloat)fd_heightForCellWithIdentifier:(NSString *)identifier configuration:(
 
     UITableViewCell *templateLayoutCell = [self fd_templateCellForReuseIdentifier:identifier];
 
-    // Manually calls to ensure consistent behavior with actual cells (that are displayed on screen).
+    // Manually calls to ensure consistent behavior with actual cells. (that are displayed on screen)
     [templateLayoutCell prepareForReuse];
 
     // Customize and provide content for our template cell.