Preparacion inicial

re #130
Primeros pasos

re #130
Merge branch 'hotfix/getCosteCM' into desarrollo
Merge branch 'hotfix/poderComprarLegados' into desarrollo
Merge branch 'hotfix/ventajasPosicionSocial' into desarrollo
Merge branch 'feature/iss121' into desarrollo
cambios ars magnus

re #130
Merge branch 'desarrollo' into feature/iss130
Muchos Ars Magnus

re #130
Terminar de introducir Ars Magnus

re #130
Preparando interfaz ars magnus

re #130
Terminar con ars magnus

arreglado #130
Merge branch 'feature/iss130' into desarrollo
Merge branch 'desarrollo'
log de cambios