Update controllers
Add oauth and google client
Fix merge conflicts.