Add toJson method to the table row data classes
Move conversion to ContentValues into the row data classes
Renamed parameter
Merge branch 'work' into develop