repair join course bug
Merge branch 'master' of https://github.com/TonySongling/Renaissance into TonySongling-master

Conflicts:
	src/Renaissance/CommonBundle/REST/Canvas/UserREST.php
Merge branch 'TonySongling-master'
button bug fixed
create token
Merge pull request #31 from TonySongling/master

create token
ignore parameters.yml
fixed