own changes
Merge branch 'development' of github.com:pse4/orange-proton into mh
some tests and some regexp changes
Merge branch 'mh' into development