Merge pull request #40 from nromanen/master

m->d
min changes after merge
order functionality changed
general changes to order functionality
changes to order model
search changed from json to model
gui+func fixes
Merge pull request #41 from nromanen/edd

Edd