made a change on testing branch
merge conflict should be fixed
minor change in testing
fixed NTI_catcher_2012_ansmachine.xml on master
on branc tts