Preliminary implementation of the norm heat flux
Tested functionality of new heat-flux based design
Resolved conflicts
Merge branch 'feature_MaxHeat'