fixing gitIgnore
fixing problem with carrierwave
Merge branch 'master' of https://github.com/lexfernandez/regionsps into BranchIgnore
Agregando ordenamientos de Categorias y de Tópicos para cada categoria.
Adding features
Merge branch 'Ordering_Categories_Topics' of https://github.com/lexfernandez/regionsps
token
logout menu
Estadisticas
Merge pull request #8 from lexfernandez/Merge_franklin

Merge franklin