Merged with master
.htaccess setup
Merge branch 'master' into production
Fixed some conflicts
Merge branch 'production' of https://github.com/nsclick/inalco into production
Merge branch 'master' into production
Online fixes
Merge branch 'production' of https://github.com/nsclick/inalco into production
Merge branch '240' into production
Mantis: 212 se daescarto los cambios hechos en la rama, se tomaron de producción
Merge branch 'production' of https://github.com/nsclick/inalco into production
Merge branch 'production'