FIXES
Merge branch 'master' of https://github.com/jbernardis/reprapnb

Conflicts:
	src/fileprep/override.py
fixed bad merge of override.py