Template removed, Cubic has both functionalities
created TestGeometry

Merge branch 'feature/better_props' of https://github.com/PMEAL/OpenPNM into feature/better_props

Conflicts:
	OpenPNM/Network/__Cubic__.py
Merge branch 'feature/better_props' of https://github.com/PMEAL/OpenPNM into feature/better_props