Added warning about new keyword in psana.conf
Merge branch 'testing' into developer

Conflicts:
	source/cheetah_ana_pkg/src/cheetah_ana_mod.cpp