test
Merge branch 'zisis' into zisis2

Conflicts:
	PivotTable/Classes/CalculatedDC/Calculation.vb
Calculation class