resolve conflict
resolve conflict
Merge branch 'master' of
https://ale-x@github.com/simvisage/simvisage.git

Conflicts:
	quaducom/quaducom/apps/sfbdemonstrator/fe_model/mr_quarter.py
in plot methods '_plot_tex_stress_strain_asc',
and '_plot_comp_stress_strain_asc' the options for plotting
the analytical stiffnesses and switching between ironed and interpolated
data set added