Merge branch 'master' into migrate-to-postgresql

* master:
  We want Ruby 1.9 syntax
  new settings
Merge pull request #5 from Soluciones/migrate-to-postgresql

Migrate to postgresql
2.0.0
Merge branch 'master' into migrate-to-rails4

* master:
  2.0.0
  We want Ruby 1.9 syntax
  new settings
ignoring patch number
Merge pull request #15 from Soluciones/migrate-to-rails4

Migrate to rails4
Merge branch 'master' into migrate-to-rails4.1

* master:
  ignoring patch number
  2.0.0

Conflicts:
	tematica.gemspec