add OtherField tube to calculate values based on other fields. Requires new attribute 'field_order' to define the order the fields should be created in.
Merge remote-tracking branch 'origin/master'

Conflicts:
	scaffolding/__init__.py