Fix Devise API-changes
Merge branch 'v2' of github.com:ff-kbu/ff-serv into v2