deleted unused SaveLoadConstants class
refactoring and javadocs
conflict merge