Newswagbranch

Merged Emily requested to merge newswagbranch into master