Removed GIT fragments

Seems that there was something wrong while merging
Merge pull request #439 from STB3/Marlin-language.h-repair

Removed GIT fragments from language.h
Corrected #endif in language.h
Fixed cardreader.h to resolve issue #440 (Pull Request  #425 missing file)
Merge pull request #441 from bkpsu/Marlin_v1

Fixed cardreader.h to resolve issue #440 (Pull Request  #425 missing file)
Merge branch 'Marlin_v1' into i2c_lcd