debugged omniauth
merging with development