Updated cell layouts
Merge branch 'dev' into feature/cell_styling

Conflicts:
	debugdrawer/Pesticide.swift
cell
Merge branch 'dev' into feature/cell_styling
Merge branch 'dev' into feature/cell_styling
Fixed merge confusion.
Merge branch 'feature/cell_styling' into dev