Fixed even/odd cycling by merging templates

Note: if <tr class="{% cycle ...%}">...</tr> is moved into a separate template, it seems not to work correctly. Since _table_row.html is only used from within table.html (and both share the same presentation logic), the easiest way to fix this is just to merge two templates into one.