integrates changes
integrates changes
Merge branch 'master' of github.com:alexstoddard/reBook
prior to branch
reimplements trade cancellation with notice to other users, and only allows reproposals where apropriate
enables trade sorting by status in matches
preliminary support for custom sort orders
add location matching and have some display of it