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

This should fix issues with pull request 467, I hope.

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde
	Marlin/ultralcd_implementation_hitachi_HD44780.h