Porzadek z classpathem
Merge branch 'master' of git@github.com:serdel/Framework.git

Conflicts:
	Heracles/.classpath
	Heracles/src/com/heracles/Framework/Serializer.java
	Heracles/src/com/heracles/Model/DayType.java
	Heracles/src/com/heracles/Model/TrainingDay.java
Merge branch 'master' of git@github.com:serdel/Framework.git

Conflicts:
	Heracles/.classpath
	Heracles/src/com/heracles/PlanDetailsPresentationModel.java