Added thermistor 60 to configuration.h
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
Merge pull request #532 from codexmas/ServoEndstops

Fix for ugly code compilation errors in SERVO_ENDSTOP checks
Merge branch 'Marlin_v1' into mendel90

Conflicts:
	Marlin/Configuration.h