modified:   examples/Aeras/ShallowWater/CMakeLists.txt
	modified:   examples/Aeras/ShallowWater/TC2/input.xml
	new file:   examples/Aeras/ShallowWater/TC3/CMakeLists.txt
	new file:   examples/Aeras/ShallowWater/TC3/input.xml
	new file:   examples/Aeras/ShallowWater/TC3/tc3.nc
	new file:   examples/Aeras/ShallowWater/TC3/tc3_out.exo
	new file:   examples/Aeras/ShallowWater/TCGalewsky/CMakeLists.txt
	new file:   examples/Aeras/ShallowWater/TCGalewsky/input.xml
	modified:   src/Aeras/evaluators/Aeras_ShallowWaterResid_Def.hpp
	modified:   src/Main_Solve.cpp
	modified:   src/adapt/AAdapt_AnalyticFunction.cpp
	modified:   src/adapt/AAdapt_AnalyticFunction.hpp

TC3 is probably working as should, Galewsky probably need a fix in hperturb
Merge branch 'master' of ssh://software.sandia.gov/git/Albany

pulling recent changes into my local rep
another commit before pulling IK's changes.
Merge branch 'master' of ssh://software.sandia.gov/git/Albany

Conflicts:
	examples/Aeras/ShallowWater/TC2/input.xml
	src/Aeras/evaluators/Aeras_ShallowWaterResid_Def.hpp
Merge branch 'master' of ssh://software.sandia.gov/git/Albany
toward tc4.
Merge branch 'master' of ssh://software.sandia.gov/git/Albany
tc4 implemented
Merge branch 'master' of ssh://software.sandia.gov/git/Albany
clean up continued...
minor changes to ncl
more cleaning, TC7 *ncl filed added
more changes to tests
Merge branch 'master' of ssh://software.sandia.gov/git/Albany
more cleanups
Merge branch 'master' of ssh://software.sandia.gov/git/Albany
more changes, *m script added
Merge branch 'master' of ssh://software.sandia.gov/git/Albany
Fixed bug in virtual temperature
added CPstar
Merge branch 'master' of software.sandia.gov:/space/git/Albany