Statements update

Major redesign of some statement types after group meeting
Merge remote-tracking branch 'origin/master'

Conflicts:
	TEST/TEST.v12.suo