Fix errors
Merge branch '0.4' of github.com:NCFDev/cellular into 0.4

Conflicts:
	cells.py