update
merge update
Merge branch 'master' of https://github.com/paulsutcliffe/lainonrails4

* 'master' of https://github.com/paulsutcliffe/lainonrails4:
  Users: Add fields, Administration panel. Rol: Administration in User module.
  Permissions. Path names: 'new', 'edit'.
  Opportunities: Relationship with country, uploader, controller methods.
  Opportunities.