Fixed gapi callback URL
Merge branch 'master' of https://github.com/xebia-france/xskillz
Fixed auth and user data merge
Merge branch 'master' of https://github.com/xebia-france/xskillz