Added redirect check to the token_login() function (#1253)
Added comment to make_redirect_to()
Bumping integration repo to fix #1242
Merge pull request #1263 from pculture/gh-1253

Gh 1253
Merge branch 'staging' into gh-1121

Conflicts:
	optional/unisubs-integration