Consolidate token cell functionality into a single class
Remove HOTPTokenCell and TOTPTokenCell subclasses
Merge branch 'cells'