CI Update
Hybrid Auth integration

First part of hybrid auth. It now forks, but I still have to do some
cleaning and little fixes to be seamlesly integrated.