Made j what it's supposed to be (two separate days)
Merge branch 'dev' into newE
Merge branch 'dev' into harris