split
Merge branch 'master' into split

Conflicts:
	Makefile.Targets
	src/global/ast.xml
aa13
SPLIT DONE
Merge branch 'split'

Conflicts:
	Makefile.Targets