changes in cdpm2
update of lattice models
Included #include "integrationrule.h"
Allowed element keyword to be given by id (number) and if not recognized, the provided string is used.
Merge branch 'master' of www.oofem.org:/data/git/oofem
Merge branch 'master' of http://www.oofem.org/git/oofem

Conflicts:
	src/sm/Elements/lattice2d.C
	src/sm/Materials/ConcreteMaterials/concretedpm2.C
	src/sm/Materials/latticedamage2d.h
	src/tm/lattice2d_mt.C