minor refactoring
Merge remote-tracking branch 'origin/master' into Igors_refactoring

Conflicts:
	src/main/java/app/ChildrenATO.java
major refactoring performed, moved repeated code