Fix redirect url for google oauth
Merge branch 'master' of https://github.com/rodia/y2tool

Conflicts:
	application/models/video_model.php