Shorten 1315 Z travel to prevent chuck collisions for new customers. Also change 1315 machine-on logic to match the 1240.

Signed-off-by: Matt Shaver <matt@mattshaver.com>
Merge branch 'v2.5_branch' of ssh://git.linuxcnc.org/git/emc2 into v2.5_branch
gremlin -remove leading tabs, no other changes
gremlin -silence errors when linuxcnc not running

If linuxcnc is not running but gremlin is, there was polling
errors. Silence these.
gladevcp -HAL_gremlin: silence Gcode error messages

Gcode errors are printed twice for some reason which causes
an error. We override gremlin's method and change it to print
directly. It still prints twice but doesn't cause an unhelpful
error message for users.
Docs: fix copy and paste error

Signed-off-by: John Thornton <jthornton@gnipsel.com>
Docs: fix broken link

Signed-off-by: John Thornton <jthornton@gnipsel.com>
Fix teleop jogging of ABC axes in negative direction
motion: introduce motion.ferror-mode

by default (motion.ferror-mode == 0), ferror is computed based on the
last commanded position, which is problematic with velocity-mode drives

if motion.ferror-mode == 1, ferror is calculated based on the new commanded
position, and following error checks are postponed until after the new
commanded position is calculated.

see also: http://www.linuxcnc.org/index.php/english/forum/search?q=servo+tuning+advice&childforums=1
Include TLO in halui's relative position outputs
gscreen config -update layout including remove mode button

removing the mode button actually requires keeping it i the glade file
but making it non visible. Need to modify gscreen proper to eliminate
error that removing it creates.
gscreen config -make the industrial spindle display work

The hal file didn't connect the hal pins
gscreen config -make sure industrial defaults to the setup mode
gscreen -make the tool index and spidle preset dialogs larger

for whatever reason GTK messageDialogs won't hounor size requests,
so switched to plain dialogs.
Made them larger so they are easier to use with touchscreen
gscreen -lower update rate of widgets

This helps with lower powered CPUs
gscreen config -add an unlock code dialog for the system tab

and fill in some comments in the handler file
Merge remote branch 'origin/v2.5_branch'

Conflicts:
	src/emc/usr_intf/gremlin/gremlin.py