Changes in bismark alberto,bismark template and macs template. Added new template for sicer, new file for collucio mapping and remaping of gabi's data.
Merge branch 'master' of github.com:Echoes-0/vital-it