moved CalcNormalShape<ET> after explicit specialization
replaced order by this->order in line 467 to fix Windows compiler error