tensorflow-models

Conflicts:
	research/object_detection/data_decoders/tf_example_decoder.py
	research/object_detection/eval.py
	research/object_detection/eval_util.py
	research/object_detection/evaluator.py
	research/object_detection/trainer.py
	research/object_detection/utils/per_image_evaluation.py
	research/syntaxnet/tensorflow