rename "default" for g++ compiler
Merge branch 'master' of https://github.com/mar-one/machine-trans-shared-task

Conflicts:
	src/languagemodel/language_model.cpp