Merge pull request #1 from JindrichPilar/master

Rozdeleni na balicky + dalsi upravy
*oprava composeru

Signed-off-by: sinacek <sinacek@gmail.com>
Merge branch 'refs/heads/master' into 2.x
Zmena namespace