change mail contents
change jar
Merge remote-tracking branch 'origin/dip' into dip