Conflicts:
	doc/api/v2/fluid/layers.rst
	python/paddle/v2/fluid/layers/nn.py