update
Merge branch 'master' of github.com:yoyoyohamapi/Reinaissance

Conflicts:
	app/config/parameters.yml
	src/Renaissance/CommonBundle/Resources/config/services.yml
clearbeforeDEV
Merge branch 'dev' of github.com:yoyoyohamapi/Reinaissance

Conflicts:
	src/Renaissance/WebBundle/Controller/CourseController.php
updateDev
updateDev1120
Merge pull request #40 from lcx-seima/master

updateDev1122toDebBranch