Materials tests
Merge branch 'master' of
https://github.com/cedric-demongivert/artic-chaos

Conflicts:
	artic-chaos/src/org/artichaos/tests/EmptyTest.java