.
merged
Merge branch '0.5.dalen' of https://github.com/NCFDev/cellular into 0.5.dalen

Conflicts:
	cells.py