tijiao
Merge remote-tracking branch 'or

Conflicts:
	symfony2常用bundle.txt