Config
Merge branch 'Marlin_v1' of https://github.com/fjriosp/Marlin into Marlin_v1

Conflicts:
	Marlin/Configuration.h