refactor
Merge remote-tracking branch 'origin/master'

Conflicts:
	Heracles/src/com/heracles/ExerciseDetailsPresentationModel.java