fixed merge conflict
Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin
Add Motherboard variant 64 - STB V1.1

Definition for the graphic LCD are already in it, they will not harm the
configuration as they are only defined constants
Add pins for Motherboard variant 64

These definition contain also the definition for the graphics LCD.
Merge pull request #411 from STB3/Marlin_w_STB_Board_support

Add STB board support to Marlin (next step towards graphic LCD implementation)
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1

* upstream/Marlin_v1:
  Add pins for Motherboard variant 64
  Add Motherboard variant 64 - STB V1.1
  Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin
  fixed merge conflict
Fix line endings
Merge branch 'Marlin_v1' into Creatr

* Marlin_v1:
  Fix line endings
  Add pins for Motherboard variant 64
  Add Motherboard variant 64 - STB V1.1
  Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin
  fixed merge conflict

Conflicts:
	Marlin/Configuration.h
Change firmware URL and machine name