Merge pull request #18 from ciudadanointeligente/master

Merge branch 'master' into 'production'
Merge branch 'master' into production
Merge pull request #24 from ciudadanointeligente/master

Merge branch 'master' into 'production'
Merge pull request #25 from ciudadanointeligente/master

Merge branch 'master' into 'production'
Merge pull request #26 from ciudadanointeligente/master

Changes in the way the config file works
Merge pull request #28 from ciudadanointeligente/master

Merge branch 'master' into 'production'
Merge pull request #29 from ciudadanointeligente/master

Merge branch 'master' into 'production'
Merge branch 'master' into production
Merge branch 'master' into production
Merge pull request #30 from ciudadanointeligente/master

Merge branch 'master' into 'production'
Merge pull request #33 from ciudadanointeligente/master

Merge branch 'master' into 'production'
Merge pull request #40 from ciudadanointeligente/master

Merge branch 'master' into 'production'
Merge pull request #41 from ciudadanointeligente/master

Merge branch 'master' into 'production'
Merge pull request #42 from ciudadanointeligente/master

Merge branch 'master' into 'production'
Merge pull request #43 from ciudadanointeligente/master

Merge branch 'master' into 'production'
Merge 'master' into production
Merge pull request #44 from ciudadanointeligente/master

Merge branch 'master' into 'production'
Merge pull request #99 from ciudadanointeligente/master

Merge 'master' to 'production' branch
Merge pull request #105 from ciudadanointeligente/master

Merge 'master' to 'production' branch
Merge 'origin/master' into 'production'