Added the ability to overwrite boundary terms in addSolution
Merge branch 'master' of github.com:CamelliaDPG/Camellia

Conflicts:
	src/include/Solution.h
Changed replaceFluxes to replaceBoundaryTerms