Merge branch 'master' of https://github.com/emag/morecat-api
Fix npe
Add property in Entry
Remove unnecessory import
Update Entry edit view