mantis 162

cambios estructura pagina
Merge branch '162'
Merge branch 'master' into production
Merge branch 'production' of https://github.com/nsclick/inalco into production
Mantis 165
Merge branch 'master' into production