dz3-dz4 refactoring
Merge branch 'master' of https://github.com/3D-GRAF/tp_2014_02_java_kildishev

Conflicts:
	test/main/java/AtomicTest.java