entities
Merge branch 'dev' of https://github.com/Morisf/shoppy into dev