calcconst done
Merge branch 'calcconst'

Conflicts:
	Makefile.Targets
	src/global/phase.mac