Merge remote-tracking branch 'origin/add_training_loss_as_metric_to_v…

…alidation' into add_training_loss_as_metric_to_validation

# Conflicts:
#	kge/job/eval.py
#	kge/job/train.py