fixing database.yml
Merge branch 'development' of github.com:jhlive/vdhackaton into development
Merge branch 'development' of github.com:jhlive/vdhackaton into development
Merge branch 'development' of github.com:jhlive/vdhackaton into development
Merge branch 'development' of github.com:jhlive/vdhackaton into development
Merge branch 'development' of github.com:jhlive/vdhackaton into development
pablo testia
Edicion de relaciones y nested models para agresores
Merge branch 'development' of github.com:jhlive/vdhackaton into development
Merge branch 'agresor' into development
Translations on  menu
merge