Merge branch 'master' into gui

Conflicts:
	lib/framework/mat_drop.m
unbroke gui componants with core lib changes
Merge branch 'development' into gui_development
single axis load matches. nothing else.
Merge branch 'development' into gui_development
Merge branch 'development' into gui_development
Merge branch 'development' into gui_development
Merge branch 'development' into gui_development
changed channels for accxyz
Merge branch 'development' into gui_development
changed channels for accxyz -- all match

loadxyz still broken
no windowing on loady&z
Merge branch 'development' into gui_development
undo modification to preprocessor
Merge branch 'development' into gui_development
no windowing on loadxyz max
Merge branch 'development' into gui_development
calibrate loady&z
added checkboxes for load single & xyz
Merge branch 'master' into gui