Merge pull request #13 from capynet/dev

Organigrama de la AED
Update company feature
Added coffe module
Added company display and linked in company list
Added company css in the correct place
company theming
Company feature finished
Merge pull request #24 from samuelsolis/dev

Creación de la sección de empresas
remove .gitignore~
actualizacion del core
Merge pull request #26 from javisr/9_actualizar_drupal_core

9 actualizar drupal core
Merge branch 'dev' of github.com:AsociacionDrupalES/asociaciondrupal into dev
Meto los class de recurring paypal para armar el modulo de commerce.