Edit Display Bindings finished
Merge branch 'martin' of https://github.com/thad54/swe2 into martin