Merge branch 'master' of https://github.com/TonySongling/Renaissance into TonySongling-master

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