made a "dirty" rfind
ignore these
Merge remote-tracking branch 'upstream/master'
Changes to GUI and database