rails 3 and postgree
Merge branch 'master' of https://github.com/jjelosua/congreso_quien_es_quien

Conflicts:
	DB/20140222_congreso_dump.sql