Merge pull request #81 from nromanen/master

Merge
finished orders 99.9%
16-01-14 14:03
merge before demo
merge