Frank v30 JOSM 7301

Updated up to JOSM defaultpresets 7301 with a mix of my changes added.