Merge pull request #22 from cider-team-mercury/latex_materials

Latex materials
Fix Integrate
Merge branch 'master' of https://github.com/cider-team-mercury/mercury
Added to layer conduction model and realistic heating
Added solid iron shear modulus and calculated profiles
Merge branch 'master' of https://github.com/cider-team-mercury/mercury into latex_materials