Merge branch 'hotfix/add_staging'

* hotfix/add_staging:
  staging added
Merge branch 'develop'

* develop:
  remove function from decorator
  good
  add reserve_reason visible for user
  add views to reserve_reason
  fix locales from users.show
  add reserve_reason
  add logos of partners
  add awful like a negro ass toogle
  add state_machines locales
  add table with new users on admin/welcome
  add buttons to users show
  edit gitignore
  remove journal file
  edit .gitignore
  add accept and reserve to admin/users controller
add access to not_accepted users
Merge branch 'hotfix/dont_views_not_confirmed_users' into develop

* hotfix/dont_views_not_confirmed_users:
  add access to not_accepted users
add edit works
fix something