Some fixes in devise, bootstrap & contact_us YML

added active flag to users and updated admin users page to allow admin to update the value ...

updated column text

Updated inactive message

updated mailers to exclude inactive users except for sharing and devise emails about their account

added tests for super admin users. added functionality for super admin to edit user info

added org and created columns to users table

swapped in good schema.rb

removed debug line

added new field to schem.rb manually

fixed schema.rb

added button to go back to users and switched from and to &&

fixed typo in schema.rb

Text changes for #345.

config/initializers/locale.rb getters/setters pointing at FastGettext. en-UK renamed to en_GB. DMPRoadmap/roadmap#98

URLs without locale param

add spanish translations

Merge branch 'postgresql' of https://github.com/DigitalCurationCentre/roadmap into postgresql