parameters
update 2
Modify logic
Add ModulesREST and PageREST
Merge branch 'TonySongling-master'
Merge branch 'master' of https://github.com/yoyoyohamapi/Reinaissance

Conflicts:
	src/Renaissance/CommonBundle/Resources/config/services.yml
merged