Fixes Devise
generate_token is replaced by Devise.friendly_token
Some small irrelevant changes as well, you can safely ignore them...
Merge branch 'add_erik' of github.com:boersmamarcel/challengesplatform into add_erik