Test
Merge branch 'master' into wip

Conflicts:
	Avero_Test2/bin/Avero_Test2/Avero_Class2.class