Merge pull request #11 from kirthar/feature/social_login

Added Facebook and Google+ Login.
Merge pull request #12 from kirthar/develop

Develop
Migrar la DB a Heroku
Merge pull request #13 from kirthar/migrate-to-postgresql

Migrar la DB a Heroku
Added multiple social logins for the same user
Merge pull request #14 from kirthar/multisociallogin

Added multiple social logins for the same user
Added accordions for teams in combats.
Merge branch 'feature/ux_improvements' of https://github.com/kirthar/med-warfare into feature/ux_improvements