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
lcx_1020_merge
lcx1021_2css
lcx1021_2css
REST
Merge pull request #17 from lcx-seima/master

lcx1022_2css
CSS Fixed!
fixed css
user center
NoChoicePng
parameters
update 2