Z-Probe bugs fixed, custom userpins.h possible
Merge branch 'master' into kossel-clear-sl-011514

Conflicts:
	src/ArduinoAVR/Repetier/Configuration.h
Merge branch 'kossel-clear-sl-011514' into kossel-clear-vanilla