omniauth facebook enabled
merge conflict hopefully fixed
fixed landing page user/employer logged in confusion
Merge branch 'master' of github.com:federicomaffei/WorkMap into omniauth
merge with devise model