surface and volume integrals rewrited
local values and integrals fixed
Merge remote-tracking branch 'mach/coupling' into coupling