Merge pull request #1 from Tornquist/devise_admin_setup

Devise admin setup
Merge remote-tracking branch 'origin/master' into bootstrap_integration