rm methods
fix methods
fix renderDataCellContent(), renderDataCell()
fix renderDataCellContent(), renderDataCell() 2
fix renderDataCellContent(), renderDataCell() 3
fix renderDataCellContent(), renderDataCell() 4
fix renderDataCellContent(), renderDataCell() 5
fix getPrimaryKey()
fix getDisplayValue()
fix displayValue(), getDisplayValue()
fix generateDisplayValue()
Merge branch 'develop'