Fixed norms in local conservation paper
Further discussion on inequalities in lc paper
Merge branch 'master' of github.com:CamelliaDPG/Camellia