Consolidation of branches

[cejkato2]

Finish work in old branches and merge them. This will be a preparation for testing.

[alexadavid]

all branches were merged or rebased into master. From now, current master branch contains all available features (and bugs?). So let's test it!