Merge branch 'edumed' of github.com:fnp/redakcja into edumed