commit
Merge branch 'master' of https://github.com/SThou/RepRapi2

Conflicts:
	Marlin/Configuration.h