Wtorkowe zmiany (Bartek + Mariusz)
Merge branch 'master' into issue#41
Layer-manager: done.
Merge branch 'issue#41' into dev