work in progress
merge

ranch 'newMaster' into restyleScript

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
fixing step2 in script
forgot the macro to haddTGraph
fixes for plots
modified scripts