Merge branch 'master' into admin-edit-identities

CHANGELOG

README.md

VERSION

app/assets/stylesheets/generic/header.scss

app/assets/stylesheets/generic/sidebar.scss

app/models/user.rb

app/views/admin/users/index.html.haml

app/views/layouts/header/_default.html.haml

app/views/layouts/header/_public.html.haml

...0150620233230_add_default_otp_required_for_login_value.rb

db/schema.rb

features/steps/groups.rb

features/steps/profile/profile.rb

features/steps/project/project.rb

spec/features/admin/admin_users_spec.rb

spec/helpers/application_helper_spec.rb

spec/helpers/groups_helper.rb

spec/models/user_spec.rb