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

Conflicts:
	app/config/parameters.yml
Merge branch 'lcx-seima-master'
pgsql supported
nothing
a
bug fixed
curl ext
b
too many redirects fixed
c
modify curlhelper
Merge branch 'master' of https://github.com/yoyoyohamapi/Renaissance
update logic
frontpage modified
Merge pull request #28 from TonySongling/master

update logic
REST
parameters
Merge branch 'master' of https://github.com/TonySongling/Renaissance into TonySongling-master

Conflicts:
	src/Renaissance/CommonBundle/REST/Canvas/UserREST.php
Merge branch 'TonySongling-master'