lsacommit
Merge pull request #13 from lsa2127291/master

course
?
Merge branch 'master' of https://github.com/lcx-seima/Reinaissance into lcx-seima-master

Conflicts:
	src/Renaissance/CommonBundle/Resources/config/services.yml
git push origin masterMerge branch 'lcx-seima-master'
lighton
song
Merge branch 'master' of https://github.com/yoyoyohamapi/Renaissance

Conflicts:
	app/config/config.yml
	app/config/parameters.yml
	src/Renaissance/CommonBundle/Resources/config/services.yml
	src/Renaissance/WebBundle/Controller/CourseController.php
	src/Renaissance/WebBundle/Resources/config/routing.yml
	src/Renaissance/WebBundle/Resources/views/Course/show.html.twig
song
Merge pull request #16 from TonySongling/master

流程跑通
fixed
fixed
twig extension
twig extension
lcx_1020_merge