change
Merge branch 'master' of https://github.com/ASD-MUM/Framework.git

Conflicts:
	bin/AFormBase$SymAction.class
	bin/AFormBase$SymWindow.class
	bin/AFormBase.class