added author
fixed transactionals
fixed transactionals
Merge branch 'master' of https://github.com/koleslena/shop