add Entity
Merge branch 'develop' of https://github.com/chinkei/Fresh into develop